Use current issue number for 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 2927 matching lines @@
   parser.add_option('-f', '--force', action='store_true',
                     help='with -b, clobber any existing branch')
   parser.add_option('-d', '--directory', action='store', metavar='DIR',
                     help='Change to the directory DIR immediately, '
                          'before doing anything else.')
   parser.add_option('--reject', action='store_true',
                     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")
+
+  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.")

[iannucci, 2016/01/30 02:54:20]

I would add some warning text here: "CAUTION: This will completely reset changes
on your branch to the content contained in the rietveld issue" or something like
that.

[Mircea Trofin, 2016/02/02 00:35:49]

Done.

+  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.print_help()

[iannucci, 2016/01/30 02:54:20]

maybe want to try

parser.error("--reapply implies 0 additional arguments"), which I think should
also print help and exit.

[Dirk Pranke, 2016/02/01 23:19:19]

nit: s/if len(args) > 0:/if args:/

[Mircea Trofin, 2016/02/02 00:35:49]

Done.

[Mircea Trofin, 2016/02/02 00:35:49]

I saw len(args) elsewhere. For consistency, I'd prefer keeping it as such. 

+      return 1
 
-  issue_arg = ParseIssueNum(args[0])
+    cl = Changelist()
+    issue_arg = cl.GetIssue()
+    upstream = cl.GetUpstreamBranch()
+    RunGit(['reset', '--hard', upstream])

[iannucci, 2016/01/30 02:54:21]

you may need to check for None here. Some folks (still) don't track upstream
branches and just have them implicitly follow e.g. origin/master.

You can try this out locally with `git checkout -b some_branch` instead of using
`git new-branch`. I suspect this function will return None in such a case and
the RunGit line will pop an exception.

[Mircea Trofin, 2016/02/02 00:35:49]

Actually, that'll set the branch to master, but I added a test to be sure.

+    if options.pull:
+      RunGit(['pull'])
+  else:
+    if len(args) != 1:
+      parser.print_help()
+      return 1

[iannucci, 2016/01/30 02:54:21]

same here and below re: parser.error

[Mircea Trofin, 2016/02/02 00:35:49]

Done.

+    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:
     parser.print_help()
     return 1
 
   # We don't want uncommitted changes mixed up with the patch.
   if git_common.is_dirty_git_tree('patch'):
     return 1
 
   # TODO(maruel): Use apply_issue.py
   # TODO(ukai): use gerrit-cherry-pick for gerrit repository?
 
   if options.newbranch:
+    if options.reapply:
+      parser.print_help()
+      return 1
     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,
                     options.directory, auth_config)
 
 
@@ skipping 734 matching lines @@
 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()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)