Show which user account each change was uploaded under

This way users are well aware of which account we used when the
uploads are complete, so they can be certain to sign into the web
application with that user identity.

Signed-off-by: Shawn O. Pearce <sop@google.com>

codereview/__init__.py

@@ -1 +1 @@
-__version__ = 'v1.0'
+__version__ = 'v1.0-14-gc4f226bc'

codereview/proto_client.py

@@ -167,6 +167,10 @@ class HttpRpc(RpcChannel):
     Returns:
       The authentication token returned by ClientLogin.
     """
+    account_type = 'GOOGLE'
+    if self.host.endswith('.google.com'):
+      account_type = 'HOSTED'
+
     req = self._CreateRequest(
         url="https://www.google.com/accounts/ClientLogin",
         data=urllib.urlencode({
@@ -174,7 +178,7 @@ class HttpRpc(RpcChannel):
             "Passwd": password,
             "service": "ah",
             "source": "gerrit-codereview-client",
-            "accountType": "HOSTED_OR_GOOGLE",
+            "accountType": account_type,
         })
     )
     try:
@@ -214,7 +218,6 @@ class HttpRpc(RpcChannel):
         response.info()["location"] != continue_location):
       raise urllib2.HTTPError(req.get_full_url(), response.code, response.msg,
                               response.headers, response.fp)
-    self.authenticated = True
 
   def _GetXsrfToken(self):
     """Fetches /proto/_token for use in X-XSRF-Token HTTP header.
@@ -253,10 +256,18 @@ class HttpRpc(RpcChannel):
     authentication cookie, it returns a 401 response and directs us to
     authenticate ourselves with ClientLogin.
     """
-    for i in range(3):
-      credentials = self.auth_function()
-      auth_token = self._GetAuthToken(credentials[0], credentials[1])
+    attempts = 0
+    while True:
+      attempts += 1
+      try:
+        cred = self.auth_function()
+        auth_token = self._GetAuthToken(cred[0], cred[1])
+      except ClientLoginError:
+        if attempts < 3:
+          continue
+        raise
       self._GetAuthCookie(auth_token)
+      self.authenticated = True
       if self.cookie_file is not None:
         self.cookie_jar.save()
       return

project.py

@@ -88,6 +88,10 @@ class ReviewableBranch(object):
     commit = self.project.bare_git.rev_parse(R_HEADS + self.name)
     return 'http://%s/r/%s' % (me.remote.review, commit[0:12])
 
+  @property
+  def owner_email(self):
+    return self.project.UserEmail
+
 
 class StatusColoring(Coloring):
   def __init__(self, config):
@@ -920,8 +924,11 @@ class Project(object):
         if out:
           out = iter(out[:-1].split('\0'))
           while out:
-            info = out.next()
-            path = out.next()
+            try:
+              info = out.next()
+              path = out.next()
+            except StopIteration:
+              break
 
             class _Info(object):
               def __init__(self, path, omode, nmode, oid, nid, state):

subcmds/upload.py

@@ -158,6 +158,7 @@ changes in all projects listed in the manifest.
                  branch.project.relpath + '/',
                  branch.name)
           print >>sys.stderr, '%s' % branch.tip_url
+          print >>sys.stderr, '(as %s)' % branch.owner_email
           print >>sys.stderr, ''
 
     if have_errors: