Allow --3way to be passed to `git apply` via `git cl patch`.

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 difflib
+from distutils.version import LooseVersion

[M-A Ruel, 2013/07/09 13:27:15]

I don't think this exists on Windows.

[tapted, 2013/07/10 01:11:52]

All my tests seem happy. I think this is just part of the python standard
library, since 1998 (aka forever). The file history is just whitepsace and
comment tweaks -
http://hg.python.org/cpython/log/b44749cee660/Lib/distutils/version.py

Tested with Python 2.6.2 in cmd.exe . I had to install unixutils and put it in
my path because `git cl patch` runs things through `sed`. There's even a
convenient conflict landed in git_cl.py the last 24 hours to see the 'old'
behaviour.

D:\src\depot_tools>python --version
Python 2.6.2

D:\src\depot_tools>where python
D:\src\depot_tools\python.bat
C:\python_26_amd64\files\python.exe

D:\src\depot_tools>python git_cl.py patch 16211005
Loaded authentication cookies from C:\Users\tapted/.codereview_upload_cookies
error: patch failed: git_cl.py:1757
error: git_cl.py: patch does not apply
Failed to apply the patch

/* rebase at 18966004 */

D:\src\depot_tools>python git_cl.py patch 18966004
Loaded authentication cookies from C:\Users\tapted/.codereview_upload_cookies
Committed patch locally.

D:\src\depot_tools>git cl patch 18966004
Loaded authentication cookies from C:\Users\tapted/.codereview_upload_cookies
error: patch failed: git_cl.py:8
Falling back to three-way merge...
Applied patch to 'git_cl.py' cleanly.
Command "git commit -m patch from issue 18966004" failed.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit, working directory clean

 import json
 import logging
 import optparse
 import os
 import re
 import stat
 import sys
 import textwrap
 import urllib2
 import urlparse
@@ skipping 56 matching lines @@
   try:
     out, code = subprocess2.communicate(['git', '--no-pager'] + args,
                                         stdout=subprocess2.PIPE)
     return code, out[0]
   except ValueError:
     # When the subprocess fails, it returns None.  That triggers a ValueError
     # when trying to unpack the return value into (out, code).
     return 1, ''
 
 
+def IsGitVersionAtLeast(min_version):
+  PREFIX='git version '
+  version = RunGit(['--version']).strip()
+  return (version.startswith(PREFIX) and
+      LooseVersion(version[len(PREFIX):]) >= LooseVersion(min_version))
+
+
 def usage(more):
   def hook(fn):
     fn.usage_more = more
     return fn
   return hook
 
 
 def ask_for_data(prompt):
   try:
     return raw_input(prompt)
@@ skipping 1595 matching lines @@
 
 
 @usage('<patch url or issue id>')
 def CMDpatch(parser, args):
   """patch in a code review"""
   parser.add_option('-b', dest='newbranch',
                     help='create a new branch off trunk for the patch')
   parser.add_option('-f', action='store_true', dest='force',
                     help='with -b, clobber any existing branch')
   parser.add_option('--reject', action='store_true', dest='reject',
-                    help='allow failed patches and spew .rej files')
+                    help='failed patches spew .rej files rather than '
+                        'attempting a 3-way merge')
   parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
                     help="don't commit after patch applies")
   (options, args) = parser.parse_args(args)
   if len(args) != 1:
     parser.print_help()
     return 1
   issue_arg = args[0]
 
   # TODO(maruel): Use apply_issue.py
   # TODO(ukai): use gerrit-cherry-pick for gerrit repository?
@@ skipping 37 matching lines @@
         ['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'], stdin=patch_data)
   except subprocess2.CalledProcessError:
     DieWithError('Git patch mungling failed.')
   logging.info(patch_data)
   # We use "git apply" to apply the patch instead of "patch" so that we can
   # pick up file adds.
   # The --index flag means: also insert into the index (so we catch adds).
   cmd = ['git', '--no-pager', 'apply', '--index', '-p0']
   if options.reject:
     cmd.append('--reject')
+  elif IsGitVersionAtLeast('1.7.12'):
+    cmd.append('--3way')
   try:
     subprocess2.check_call(cmd, stdin=patch_data, stdout=subprocess2.VOID)
   except subprocess2.CalledProcessError:
     DieWithError('Failed to apply the patch')
 
   # If we had an issue, commit the current state and register the issue.
   if not options.nocommit:
     RunGit(['commit', '-m', 'patch from issue %s' % issue])
     cl = Changelist()
     cl.SetIssue(issue)
@@ skipping 372 matching lines @@
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 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:]))