From 1d88dd3d3f5293c885e9bd808a0fc684af7f0868 Mon Sep 17 00:00:00 2001
From: "mtrofin@chromium.org" <mtrofin@chromium.org>
Date: Thu, 4 Feb 2016 16:25:12 +0000
Subject: [PATCH] Use current issue number for git cl patch

This change adds the option to use the current issue number, if any,
when doing a git cl patch. Instead of doing git cl issue (copy the
number) git cl patch <number>, one can simply do git cl patch -i

BUG=

Review URL: https://codereview.chromium.org/1641903002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298582 0039d316-1c4b-4281-b951-d872f2087c98
---
 git_cl.py | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/git_cl.py b/git_cl.py
index 7e43349f2..8eda0dc62 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2952,15 +2952,45 @@ def CMDpatch(parser, args):
                         'attempting a 3-way merge')
   parser.add_option('-n', '--no-commit', action='store_true', dest='nocommit',
                     help="don't commit after patch applies")
+
+  group = optparse.OptionGroup(parser,
+                    """Options for continuing work on the current issue uploaded
+from a different clone (e.g. different machine). Must be used independently from
+the other options. No issue number should be specified, and the branch must have
+an issue number associated with it""")
+  group.add_option('--reapply', action='store_true',
+                    dest='reapply',
+                    help="""Reset the branch and reapply the issue.
+CAUTION: This will undo any local changes in this branch""")
+
+  group.add_option('--pull', action='store_true', dest='pull',
+                    help="Performs a pull before reapplying.")
+  parser.add_option_group(group)
+
   auth.add_auth_options(parser)
   (options, args) = parser.parse_args(args)
   auth_config = auth.extract_auth_config_from_options(options)
 
-  if len(args) != 1:
-    parser.print_help()
-    return 1
+  issue_arg = None
+  if options.reapply :
+    if len(args) > 0:
+      parser.error("--reapply implies no additional arguments.")
+
+    cl = Changelist()
+    issue_arg = cl.GetIssue()
+    upstream = cl.GetUpstreamBranch()
+    if upstream == None:
+      parser.error("No upstream branch specified. Cannot reset branch")
+
+    RunGit(['reset', '--hard', upstream])
+    if options.pull:
+      RunGit(['pull'])
+  else:
+    if len(args) != 1:
+      parser.error("Must specify issue number")
+
+    issue_arg = ParseIssueNum(args[0])
 
-  issue_arg = ParseIssueNum(args[0])
   # The patch URL works because ParseIssueNum won't do any substitution
   # as the re.sub pattern fails to match and just returns it.
   if issue_arg == None:
@@ -2975,6 +3005,8 @@ def CMDpatch(parser, args):
   # TODO(ukai): use gerrit-cherry-pick for gerrit repository?
 
   if options.newbranch:
+    if options.reapply:
+      parser.error("--reapply excludes any option other than --pull")
     if options.force:
       RunGit(['branch', '-D', options.newbranch],
           stderr=subprocess2.PIPE, error_ok=True)