codereview: clpatch tweaks

R=agl1
https://golang.org/cl/152114

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index 5f2e17d8d4c62f3ef2b427fbdbf551503179afb7..499b0061fbd09e151fbbf3490ef846a39a4304bb 100644 (file)
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -1352,10 +1352,14 @@ def DownloadCL(ui, repo, clname):
        try:
                data = MySend("/user_popup/" + nick, force_auth=False)
        except:
-               return None, None, "error looking up %s: %s" % (nick, ExceptionDetail())
+               ui.warn("error looking up %s: %s\n" % (nick, ExceptionDetail()))
+               cl.original_author = nick+"@needtofix"
+               return cl, diffdata, ""
        match = re.match(r"<b>(.*) \((.*)\)</b>", data)
-       if not match or match.group(2) != nick:
-               return None, None, "error looking up %s: cannot parse result" % (nick,)
+       if not match:
+               return None, None, "error looking up %s: cannot parse result %s" % (nick, repr(data))
+       if match.group(1) != nick and match.group(2) != nick:
+               return None, None, "error looking up %s: got info for %s, %s" % (nick, match.group(1), match.group(2))
        email = match.group(1)
 
        # Temporary hack until we move to the public code review server.