git cl upload: print patchset when uploading to Rietvled.

third_party/upload.py

 #!/usr/bin/env python
 # coding: utf-8
 #
 # Copyright 2007 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
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 2466 matching lines @@
   if not options.download_base:
     form_fields.append(("content_upload", "1"))
   if len(data) > MAX_UPLOAD_SIZE:
     print "Patch is large, so uploading file patches separately."
     uploaded_diff_file = []
     form_fields.append(("separate_patches", "1"))
   else:
     uploaded_diff_file = [("data", "data.diff", data)]
   ctype, body = EncodeMultipartFormData(form_fields, uploaded_diff_file)
   response_body = rpc_server.Send("/upload", body, content_type=ctype)
-  patchset = None
+  issue, patchset = None, None
   if not options.download_base or not uploaded_diff_file:
     lines = response_body.splitlines()
     if len(lines) >= 2:
-      msg = lines[0]
+      # lines[0] is "Issue (created|updated): <url>".
+      issue = lines[0][lines[0].rfind("/")+1:]
+      # lines[1] is just patchset number.
       patchset = lines[1].strip()
+      msg = '%s (patchset: %s)' % (lines[0], patchset)
       patches = [x.split(" ", 1) for x in lines[2:]]
     else:
       msg = response_body
   else:
     msg = response_body
   StatusUpdate(msg)
   if not response_body.startswith("Issue created.") and \
   not response_body.startswith("Issue updated."):
     sys.exit(0)
-  issue = msg[msg.rfind("/")+1:]
+  assert issue

[Bons, 2016/03/08 18:48:22]

this is meant to be in here?

[tandrii(chromium), 2016/03/08 19:02:47]

Yes, as I slightly changed logical conditions from previous versions. Thus,
while i am 99% certain my change is OK, this assert will help find the CL in the
event that I am wrong.

 
   if not uploaded_diff_file:
     result = UploadSeparatePatches(issue, rpc_server, patchset, data, options)
     if not options.download_base:
       patches = result
 
   if not options.download_base:
     vcs.UploadBaseFiles(issue, rpc_server, patches, patchset, options, files)
 
   payload = {}  # payload for final request
@@ skipping 19 matching lines @@
     print
     StatusUpdate("Interrupted.")
     sys.exit(1)
   except auth.AuthenticationError as e:
     print >> sys.stderr, e
     sys.exit(1)
 
 
 if __name__ == "__main__":
   main()