Support getting changes of non-HEAD branches

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 295 matching lines @@
       ((['git', 'config', 'branch.master.rietveldissue'],), ''),
       ((['git', 'config', 'branch.master.gerritissue'],), ''),
       ((['git', 'config', 'rietveld.server'],),
        'codereview.example.com'),
       ((['git', 'config', 'branch.master.merge'],), 'master'),
       ((['git', 'config', 'branch.master.remote'],), 'origin'),
       ((['get_or_create_merge_base', 'master', 'master'],),
        'fake_ancestor_sha'),
     ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
       ((['git', 'rev-parse', '--show-cdup'],), ''),
-      ((['git', 'rev-parse', 'HEAD'],), '12345'),
+      ((['git', 'rev-parse', 'refs/heads/master'],), '12345'),
       ((['git', 'diff', '--name-status', '--no-renames', '-r',
-         'fake_ancestor_sha...', '.'],),
+         'fake_ancestor_sha...refs/heads/master', '.'],),
         'M\t.gitignore\n'),
       ((['git', 'config', 'branch.master.rietveldpatchset'],),
        ''),
       ((['git', 'log', '--pretty=format:%s%n%n%b',
-         'fake_ancestor_sha...'],),
+         'fake_ancestor_sha...refs/heads/master'],),
        'foo'),
       ((['git', 'config', 'user.email'],), 'me@example.com'),
       stat_call,
       ((['git', 'log', '--pretty=format:%s\n\n%b',
          'fake_ancestor_sha..HEAD'],),
        'desc\n'),
       ((['git', 'config', 'rietveld.bug-prefix'],), ''),
     ]
 
   @classmethod
@@ skipping 42 matching lines @@
     ]
 
   @staticmethod
   def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
     fake_ancestor = 'fake_ancestor'
     fake_cl = 'fake_cl_for_patch'
     return [
       ((['git',
          'rev-parse', '--verify', diff_base],), fake_ancestor),
       ((['git',
-         'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
+         'merge-base', fake_ancestor, 'refs/heads/'+working_branch],),
+       fake_ancestor),
       ((['git',
-         'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
+         'rev-list', '^' + fake_ancestor, 'refs/heads/'+working_branch],),
+       fake_cl),
       # Mock a config miss (error code 1)
       ((['git',
          'config', 'gitcl.remotebranch'],), (('', None), 1)),
     ] + ([
       # Call to GetRemoteBranch()
       ((['git',
          'config', 'branch.%s.merge' % working_branch],),
        'refs/heads/master'),
       ((['git',
          'config', 'branch.%s.remote' % working_branch],), 'origin'),
@@ skipping 43 matching lines @@
          '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
       ((['git',
          'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
          'refs/remotes/origin/master'],), ''),
       ((['git',
          'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
        'fake_ancestor_sha'),
     ]
 
   @classmethod
-  def _dcommit_calls_normal(cls):
+  def _dcommit_calls_normal(cls, working_branch='master'):
     return [
       ((['git', 'rev-parse', '--show-cdup'],), ''),
-      ((['git', 'rev-parse', 'HEAD'],),
+      ((['git', 'rev-parse', 'refs/heads/'+working_branch],),
           '00ff397798ea57439712ed7e04ab96e13969ef40'),
       ((['git',
-         'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
-         '.'],),
+         'diff', '--name-status', '--no-renames', '-r',
+         'fake_ancestor_sha...refs/heads/'+working_branch, '.'],),
         'M\tPRESUBMIT.py'),
       ((['git',
          'config', 'branch.working.rietveldpatchset'],), '31137'),
       ((['git', 'config', 'branch.working.rietveldserver'],),
          'codereview.example.com'),
       ((['git', 'config', 'user.email'],), 'author@example.com'),
       ((['git', 'config', 'rietveld.tree-status-url'],), ''),
   ]
 
   @classmethod
@@ skipping 188 matching lines @@
           '--similarity.\n',
           stdout.getvalue())
       self.assertEqual(
           'Must specify reviewers to send email.\n', stderr.getvalue())
 
   def test_dcommit(self):
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.calls = (
         self._dcommit_calls_1() +
         self._git_sanity_checks('fake_ancestor_sha', 'working') +
-        self._dcommit_calls_normal() +
+        self._dcommit_calls_normal('working') +
         self._dcommit_calls_3())
     git_cl.main(['dcommit'])
 
   def test_dcommit_bypass_hooks(self):
     self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
     self.calls = (
         self._dcommit_calls_1() +
         self._dcommit_calls_bypassed() +
         self._dcommit_calls_3())
     git_cl.main(['dcommit', '--bypass-hooks'])
@@ skipping 37 matching lines @@
         ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
         ((['git', 'config', 'branch.master.remote'],), 'origin'),
         ((['get_or_create_merge_base', 'master',
            'refs/remotes/origin/master'],),
          'fake_ancestor_sha'),
         # Calls to verify branch point is ancestor
       ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
            cls._git_sanity_checks('fake_ancestor_sha', 'master',
                                   get_remote_branch=False)) + [
         ((['git', 'rev-parse', '--show-cdup'],), ''),
-        ((['git', 'rev-parse', 'HEAD'],), '12345'),
+        ((['git', 'rev-parse', 'refs/heads/master'],), '12345'),
 
         ((['git',
            'diff', '--name-status', '--no-renames', '-r',
-           'fake_ancestor_sha...', '.'],),
+           'fake_ancestor_sha...refs/heads/master', '.'],),
          'M\t.gitignore\n'),
         ((['git', 'config', 'branch.master.gerritpatchset'],), ''),
       ] + ([] if issue else [
         ((['git',
-           'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
+           'log', '--pretty=format:%s%n%n%b',
+           'fake_ancestor_sha...refs/heads/master'],),
          'foo'),
       ]) + [
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git',
            'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
            '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
          '+dat'),
       ]
 
   @classmethod
@@ skipping 629 matching lines @@
     # TODO(tandrii): consider testing just set-commit and set-commit --clear,
     # but without copy-pasting tons of expectations, as modifying them later is
     # super tedious.
     self.assertEqual(0, git_cl.main(['set-commit', '-d']))
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()