Upload project option

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import datetime
@@ skipping 1056 matching lines @@
   if 'GERRIT_HOST' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
     #ORIGIN_URL_CONFIG: http://src.chromium.org/git
     RunGit(['config', keyvals['PUSH_URL_CONFIG'],
             keyvals['ORIGIN_URL_CONFIG']])
 
+  if 'PROJECT' in keyvals:
+    branchref = RunGit(['symbolic-ref', 'HEAD']).strip()

[iannucci, 2014/05/27 18:00:33]

What happens when the user has a detached HEAD?

[sheyang, 2014/06/02 22:56:48]

Discussed offline. This will be saved into .git/config as other settings.

+    branch = ShortBranchName(branchref)

[iannucci, 2014/05/27 18:00:33]

what does shortbranchname do? Is this the same as `git symbolic-ref --short
HEAD`?

[sheyang, 2014/06/02 22:56:48]

It converts the name like 'refs/heads/foo' to 'foo'. Not sure what it's for, and
probably will change the behavior to show the full name, but for now just use it
as everywhere else.

+    RunGit(['config', 'branch.%s.project' % branch, keyvals['PROJECT']],

[agable, 2014/05/30 14:24:07]

a) Why are you saving the PROJECT value in .git/config? (I see the other values
get stored there, but I don't understand why, since the codereview.settings file
is going to get read every time no matter what anyway).
b) Why are you saving PROJECT on a per-branch basis? The codereview.settings
file should change on a per-branch basis in general, given chromium's branching
model.

[sheyang, 2014/06/02 22:56:48]

1. Yep it's not ideal... Just to make it consistent with any other settings for
now
2. Fixed

+           error_ok=False)
+
 
 def urlretrieve(source, destination):
   """urllib is broken for SSL connections via a proxy therefore we
   can't use urllib.urlretrieve()."""
   with open(destination, 'w') as f:
     f.write(urllib2.urlopen(source).read())
 
 
 def hasSheBang(fname):
   """Checks fname is a #! script."""
@@ skipping 518 matching lines @@
         keys = dict(line.split(': ', 1) for line in data.splitlines()
                     if ': ' in line)
         remote_url = keys.get('URL', None)
     else:
       if cl.GetRemoteUrl() and '/' in cl.GetUpstreamBranch():
         remote_url = (cl.GetRemoteUrl() + '@'
                       + cl.GetUpstreamBranch().split('/')[-1])
   if remote_url:
     upload_args.extend(['--base_url', remote_url])
 
+  project = RunGit(['config', 'branch.%s.project' % cl.GetBranch()],
+                   error_ok=True).strip()
+  if project:
+    upload_args.extend(['--project', project])
+
   try:
     upload_args = ['upload'] + upload_args + args
     logging.info('upload.RealMain(%s)', upload_args)
     issue, patchset = upload.RealMain(upload_args)
     issue = int(issue)
     patchset = int(patchset)
   except KeyboardInterrupt:
     sys.exit(1)
   except:
     # If we got an exception after the user typed a description for their
@@ skipping 975 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))