Adding --directory option to 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."""
 
 from distutils.version import LooseVersion
@@ skipping 1846 matching lines @@
   return SendUpstream(parser, args, 'push')
 
 
 @subcommand.usage('<patch url or issue id>')
 def CMDpatch(parser, args):
   """Patches 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('-d', '--directory', action='store', dest='directory',

[M-A Ruel, 2013/10/16 16:10:12]

Remove dest argument. While at it, remove it on 'reject' and force and add
proper '--force' support.

You may want to use metavar='DIR' and use DIR instead of DIRECTORY in the help
string.

[qsr, 2013/10/16 16:16:53]

Done.

+                    help='Change to the directory DIRECTORY immediately, '
+                         'before doing anything else.')
   parser.add_option('--reject', action='store_true', dest='reject',
                     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?
 
   if options.newbranch:
     if options.force:
       RunGit(['branch', '-D', options.newbranch],
           stderr=subprocess2.PIPE, error_ok=True)
     RunGit(['checkout', '-b', options.newbranch,
             Changelist().GetUpstreamBranch()])
 
-  return PatchIssue(issue_arg, options.reject, options.nocommit)
+  return PatchIssue(issue_arg, options.reject, options.nocommit,
+                    options.directory)
 
 
-def PatchIssue(issue_arg, reject, nocommit):
+def PatchIssue(issue_arg, reject, nocommit, directory):
   if type(issue_arg) is int or issue_arg.isdigit():
     # Input is an issue id.  Figure out the URL.
     issue = int(issue_arg)
     cl = Changelist(issue=issue)
     patchset = cl.GetMostRecentPatchset()
     patch_data = cl.GetPatchSetDiff(issue, patchset)
   else:
     # Assume it's a URL to the patch. Default to https.
     issue_url = gclient_utils.UpgradeToHttps(issue_arg)
     match = re.match(r'.*?/issue(\d+)_(\d+).diff', issue_url)
@@ skipping 21 matching lines @@
     DieWithError('Git patch mungling failed.')
   logging.info(patch_data)
   env = os.environ.copy()
   # 'cat' is a magical git string that disables pagers on all platforms.
   env['GIT_PAGER'] = 'cat'
 
   # 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', 'apply', '--index', '-p0']
+  if directory:
+    cmd.append('--directory')

[M-A Ruel, 2013/10/16 16:10:12]

cmd.extend(('--directory', directory))

[qsr, 2013/10/16 16:16:53]

Done.

+    cmd.append(directory)
   if reject:
     cmd.append('--reject')
   elif IsGitVersionAtLeast('1.7.12'):
     cmd.append('--3way')
   try:
     subprocess2.check_call(cmd, env=env,
                            stdin=patch_data, stdout=subprocess2.VOID)
   except subprocess2.CalledProcessError:
     DieWithError('Failed to apply the patch')
 
@@ skipping 210 matching lines @@
   """shows differences between local tree and last upload."""
   cl = Changelist()
   branch = cl.GetBranch()
   TMP_BRANCH = 'git-cl-diff'
   base_branch = RunGit(['merge-base', cl.GetUpstreamBranch(), 'HEAD']).strip()
 
   # Create a new branch based on the merge-base
   RunGit(['checkout', '-q', '-b', TMP_BRANCH, base_branch])
   try:
     # Patch in the latest changes from rietveld.
-    rtn = PatchIssue(cl.GetIssue(), False, False)
+    rtn = PatchIssue(cl.GetIssue(), False, False, None)
     if rtn != 0:
       return rtn
 
     # Switch back to starting brand and diff against the temporary
     # branch containing the latest rietveld patch.
     subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch])
   finally:
     RunGit(['checkout', '-q', branch])
     RunGit(['branch', '-D', TMP_BRANCH])
 
@@ skipping 128 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:]))