Revert of Use tracking remote name for gerrit upload.

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 and Gerrit."""
 
 from distutils.version import LooseVersion
@@ skipping 2440 matching lines @@
   # whitespace. This code is not doing this, but it clearly won't decrease
   # entropy.
   lines.append(message)
   change_hash = RunCommand(['git', 'hash-object', '-t', 'commit', '--stdin'],
                            stdin='\n'.join(lines))
   return 'I%s' % change_hash.strip()
 
 
 def GerritUpload(options, args, cl, change):
   """upload the current branch to gerrit."""
+  # We assume the remote called "origin" is the one we want.
+  # It is probably not worthwhile to support different workflows.
+  gerrit_remote = 'origin'
+
   remote, remote_branch = cl.GetRemoteBranch()

[tandrii(chromium), 2016/03/28 15:44:37]

alokp@ I think the right fix is to actually check `remote` here, and if it's '.'
(meaning local branch), then go recursively to fetch remote of it, and so on
until remote isn't '.'.

   branch = GetTargetRef(remote, remote_branch, options.target_branch,
                         pending_prefix='')
 
   change_desc = ChangeDescription(
       options.message or CreateDescriptionFromLog(args))
   if not change_desc.description:
     print "\nDescription is empty. Aborting..."
     return 1
 
   if options.title:
@@ skipping 40 matching lines @@
       parent = cl.GetCommonAncestorWithUpstream()
 
     tree = RunGit(['rev-parse', 'HEAD:']).strip()
     ref_to_push = RunGit(['commit-tree', tree, '-p', parent,
                           '-m', message]).strip()
   else:
     if not git_footers.get_footer_change_id(change_desc.description):
       DownloadGerritHook(False)
       change_desc.set_description(AddChangeIdToCommitMessage(options, args))
     ref_to_push = 'HEAD'
-    parent = '%s/%s' % (remote, branch)
+    parent = '%s/%s' % (gerrit_remote, branch)
     change_id = git_footers.get_footer_change_id(change_desc.description)[0]
 
   commits = RunGitSilent(['rev-list', '%s..%s' % (parent,
                                                   ref_to_push)]).splitlines()
   if len(commits) > 1:
     print('WARNING: This will upload %d commits. Run the following command '
           'to see which commits will be uploaded: ' % len(commits))
     print('git log %s..%s' % (parent, ref_to_push))
     print('You can also use `git squash-branch` to squash these into a single '
           'commit.')
@@ skipping 10 matching lines @@
   if cc:
     receive_options += ['--cc=' + email for email in cc]
   if change_desc.get_reviewers():
     receive_options.extend(
         '--reviewer=' + email for email in change_desc.get_reviewers())
 
   git_command = ['push']
   if receive_options:
     git_command.append('--receive-pack=git receive-pack %s' %
                        ' '.join(receive_options))
-  git_command += [remote, ref_to_push + ':refs/for/' + branch]
+  git_command += [gerrit_remote, ref_to_push + ':refs/for/' + branch]
   push_stdout = gclient_utils.CheckCallAndFilter(
       ['git'] + git_command,
       print_stdout=True,
       # Flush after every line: useful for seeing progress when running as
       # recipe.
       filter_fn=lambda _: sys.stdout.flush())
 
   if options.squash:
     regex = re.compile(r'remote:\s+https?://[\w\-\.\/]*/(\d+)\s.*')
     change_numbers = [m.group(1)
@@ skipping 1698 matching lines @@
 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()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)