Allow using issue URL 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 2854 matching lines @@
 @subcommand.usage('[upstream branch to apply against]')
 def CMDland(parser, args):
   """Commits the current changelist via git."""
   if settings.GetIsGitSvn() or get_footer_svn_id():
     print('This appears to be an SVN repository.')
     print('Are you sure you didn\'t mean \'git cl dcommit\'?')
     print('(Ignore if this is the first commit after migrating from svn->git)')
     ask_for_data('[Press enter to push or ctrl-C to quit]')
   return SendUpstream(parser, args, 'land')
 
+def ParseIssueNum(arg):

[scottmg, 2015/09/23 19:17:03]

nit; two blank lines between top level functions in .py, and add a """ comment.

[dsinclair, 2015/09/23 19:22:28]

Done.

Didn't see comments on the other ones, didn't realize the comments went inside
the method in python, heh.

+  if re.match(r'\d+', arg):

[scottmg, 2015/09/23 19:17:03]

maybe

  or args.endswith('.diff')

would be a safer way to make sure the patch case is still handled.

[dsinclair, 2015/09/23 19:22:28]

It's not as easy to share in that case as the git cl checkout doesn't accept
.patch URLs. So, is it better not to share, or do it as I've done it? (Or am I
missing a third option?)

[scottmg, 2015/09/23 19:35:45]

Oh, right. OK, lgtm then.

+    return arg
+  if arg.startswith('http'):
+    return re.sub(r'.*/(\d+)/?', r'\1', arg)
+  return None
 
-@subcommand.usage('<patch url or issue id>')
+@subcommand.usage('<patch url or issue id or issue url>')
 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', '--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")
   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 = 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:
+    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.force:
@@ skipping 634 matching lines @@
 
 @subcommand.usage('<codereview url or issue id>')
 def CMDcheckout(parser, args):
   """Checks out a branch associated with a given Rietveld issue."""
   _, args = parser.parse_args(args)
 
   if len(args) != 1:
     parser.print_help()
     return 1
 
-  if re.match(r'\d+', args[0]):
-    target_issue = args[0]
-  elif args[0].startswith('http'):
-    target_issue = re.sub(r'.*/(\d+)/?', r'\1', args[0])
-  else:
+  target_issue = ParseIssueNum(args[0])
+  if target_issue == None:
     parser.print_help()
     return 1
 
   key_and_issues = [x.split() for x in RunGit(
       ['config', '--local', '--get-regexp', r'branch\..*\.rietveldissue'])
       .splitlines()]
   branches = []
   for key, issue in key_and_issues:
     if issue == target_issue:
       branches.append(re.sub(r'branch\.(.*)\.rietveldissue', r'\1', key))
@@ skipping 72 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)