codereview: fix clpatch

I love Python.  Write once, crash anywhere.

TBR=r
CC=golang-dev
https://golang.org/cl/4382043

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index bd9a179f82e1f705af1e88397db986d7fe84cbc8..827054bf0bac445488dd0d10df5567077ae45c89 100644 (file)
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -1333,16 +1333,16 @@ def reposetup(ui, repo):
 
 def CheckContributor(ui, repo, user=None):
        set_status("checking CONTRIBUTORS file")
-       if not user:
-               user = ui.config("ui", "username")
-               if not user:
-                       raise util.Abort("[ui] username is not configured in .hgrc")
        _, userline = FindContributor(ui, repo, user, warn=False)
        if not userline:
                raise util.Abort("cannot find %s in CONTRIBUTORS" % (user,))
        return userline
 
-def FindContributor(ui, repo, user, warn=True):
+def FindContributor(ui, repo, user=None, warn=True):
+       if not user:
+               user = ui.config("ui", "username")
+               if not user:
+                       raise util.Abort("[ui] username is not configured in .hgrc")
        user = user.lower()
        m = re.match(r".*<(.*)>", user)
        if m: