code review 4382043: codereview: fix clpatch

lib/codereview/codereview.py

 # coding=utf-8
 # (The line above is necessary so that I can use 世界 in the
 # *comment* below without Python getting all bent out of shape.)
 
 # Copyright 2007-2009 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ skipping 1315 matching lines @@
 def reposetup(ui, repo):
         global original_match
         if original_match is None:
                 start_status_thread()
                 original_match = cmdutil.match
                 cmdutil.match = ReplacementForCmdutilMatch
                 RietveldSetup(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:
                 user = m.group(1)
 
         if user not in contributors:
                 if warn:
                         ui.warn("warning: cannot find %s in CONTRIBUTORS\n" % (user,))
                 return None, None
 ········
@@ skipping 1585 matching lines @@
                 ctype, body = EncodeMultipartFormData(form_fields, files)
                 url = "/%d/upload_patch/%d" % (int(issue), int(patchset))
                 print "Uploading patch for " + patch[0]
                 response_body = rpc_server.Send(url, body, content_type=ctype)
                 lines = response_body.splitlines()
                 if not lines or lines[0] != "OK":
                         StatusUpdate("  --> %s" % response_body)
                         sys.exit(1)
                 rv.append([lines[1], patch[0]])
         return rv