git_cl sanity checks

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 json
@@ skipping 145 matching lines @@
   dirty = RunGit(['diff-index', '--name-status', 'HEAD'])
   if dirty:
     print 'Cannot %s with a dirty tree. You must commit locally first.' % cmd
     print 'Uncommitted files: (git diff-index --name-status HEAD)'
     print dirty[:4096]
     if len(dirty) > 4096:
       print '... (run "git diff-index --name-status HEAD" to see full output).'
     return True
   return False
 
+
+def git_cl_sanity_checks(upstream_git_obj):

[M-A Ruel, 2012/10/28 20:53:02]

Would still like a oneliner docstring for the purpose of the function

[Isaac (away), 2012/10/28 21:16:42]

Done.

+  # First verify that the commit we're diffing against is in our tree.
+  upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
+  common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
+  if upstream_sha != common_ancestor:
+    print >> sys.stderr, (
+        'ERROR: %s is not in the current branch.  You may need to rebase your '
+        'tracking branch' % upstream_sha)
+    return False
+
+  commits_in_diff = RunGit(
+      ['rev-list', '^%s' % upstream_sha, 'HEAD']).splitlines()
+  commits_in_origin = RunGit(
+      ['rev-list', '^%s' % upstream_sha, 'remotes/origin/master']).splitlines()
+
+  common_commits = set(commits_in_diff) & set(commits_in_origin)
+  if common_commits:
+    print >> sys.stderr, (
+        'ERROR: Your diff contains %d commits already in origin/master.\n'
+        'Run "git log --oneline origin/master..HEAD" to get a list of commits '
+        'in the diff' % len(common_commits))
+    return False
+  return True
+
+
 def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
   """Return the corresponding git ref if |base_url| together with |glob_spec|
   matches the full |url|.
 
   If |allow_wildcards| is true, |glob_spec| can contain wildcards (see below).
   """
   fetch_suburl, as_ref = glob_spec.split(':')
   if allow_wildcards:
     glob_match = re.match('(.+/)?(\*|{[^/]*})(/.+)?', fetch_suburl)
     if glob_match:
@@ skipping 424 matching lines @@
     if issue:
       RunGit(['config', self._IssueSetting(), str(issue)])
       if self.rietveld_server:
         RunGit(['config', self._RietveldServer(), self.rietveld_server])
     else:
       RunGit(['config', '--unset', self._IssueSetting()])
       self.SetPatchset(0)
     self.has_issue = False
 
   def GetChange(self, upstream_branch, author):
+    if not git_cl_sanity_checks(upstream_branch):
+      DieWithError('\nGit sanity check failure')
+
     root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip() or '.'
     absroot = os.path.abspath(root)
 
     # We use the sha1 of HEAD as a name of this change.
     name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
     # Need to pass a relative path for msysgit.
     try:
       files = scm.GIT.CaptureStatus([root], '.', upstream_branch)
     except subprocess2.CalledProcessError:
       DieWithError(
@@ skipping 391 matching lines @@
   (options, args) = parser.parse_args(args)
 
   if not options.force and is_dirty_git_tree('presubmit'):
     print 'use --force to check even if tree is dirty.'
     return 1
 
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
-    # Default to diffing against the "upstream" branch.
-    base_branch = cl.GetUpstreamBranch()
+    # Default to diffing against the common ancestor of the upstream branch.
+    base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
 
   cl.RunHook(committing=not options.upload, upstream_branch=base_branch,
              may_prompt=False, verbose=options.verbose,
              author=None)
   return 0
 
 
 def AddChangeIdToCommitMessage(options, args):
   """Re-commits using the current message, assumes the commit hook is in
   place.
@@ skipping 176 matching lines @@
         'See http://goo.gl/JGg0Z for details.\n')
 
   if is_dirty_git_tree('upload'):
     return 1
 
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
   else:
-    # Default to diffing against the "upstream" branch.
-    base_branch = cl.GetUpstreamBranch()
-    args = [base_branch + "..."]
+    # Default to diffing against common ancestor of upstream branch
+    base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
+    args = [base_branch]
 
   if not options.bypass_hooks:
     hook_results = cl.RunHook(committing=False, upstream_branch=base_branch,
                               may_prompt=not options.force,
                               verbose=options.verbose,
                               author=None)
     if not hook_results.should_continue():
       return 1
     if not options.reviewers and hook_results.reviewers:
       options.reviewers = hook_results.reviewers
@@ skipping 417 matching lines @@
   cl = Changelist()
   if not cl.GetIssue():
     parser.error('Need to upload first')
 
   if not options.name:
     options.name = cl.GetBranch()
 
   # Process --bot and --testfilter.
   if not options.bot:
     # Get try slaves from PRESUBMIT.py files if not specified.
-    change = cl.GetChange(cl.GetUpstreamBranch(), None)
+    change = cl.GetChange(
+      RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip(),
+      None)
     options.bot = presubmit_support.DoGetTrySlaves(
         change,
         change.LocalPaths(),
         settings.GetRoot(),
         None,
         None,
         options.verbose,
         sys.stdout)
   if not options.bot:
     parser.error('No default try builder to try, use --bot')
@@ skipping 139 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))