Add "archive" command to git_cl.py.

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 and Gerrit."""
 
 from distutils.version import LooseVersion
@@ skipping 2929 matching lines @@
   # Silence upload.py otherwise it becomes unwieldly.
   upload.verbosity = 0
 
   if fine_grained:
     # Process one branch synchronously to work through authentication, then
     # spawn processes to process all the other branches in parallel.
     if changes:
       fetch = lambda cl: (cl, cl.GetStatus())
       yield fetch(changes[0])
 
+      if len(changes) == 0:
+        # Exit early if there was only one branch to fetch.
+        return
+
       changes_to_fetch = changes[1:]
       pool = ThreadPool(
           min(max_processes, len(changes_to_fetch))
               if max_processes is not None
               else len(changes_to_fetch))
 
       fetched_cls = set()
       it = pool.imap_unordered(fetch, changes_to_fetch).__iter__()
       while True:
         try:
@@ skipping 106 matching lines @@
 
   print
   print 'Upload complete for dependent branches!'
   for dependent_branch in dependents:
     upload_status = 'failed' if failures.get(dependent_branch) else 'succeeded'
     print '  %s : %s' % (dependent_branch, upload_status)
   print
 
   return 0
 
+def CMDcleanup(parser, args):
+  """Archives and deletes branches associated with closed changelists."""
+  parser.add_option(
+      '-j', '--maxjobs', action='store', type=int,
+      help='The maximum number of jobs to use when retrieving review status')
+
+  parser.add_option(
+      '-f', action='store_true', dest='force', default=False,
+      help='Bypasses the confirmation prompt.')
+
+  auth.add_auth_options(parser)
+  options, args = parser.parse_args(args)
+  if args:
+    parser.error('Unsupported args: %s' % args)

[tandrii(chromium), 2016/05/31 18:46:16]

parser.error('Unsupported args: %s' % ' '.join(args))

[Kevin M, 2016/05/31 20:05:21]

Done.

+  auth_config = auth.extract_auth_config_from_options(options)
+
+  branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
+  if not branches:
+    print 'No local branch found.'
+    return 0
+
+  print 'Finding all branches associated with closed issues...'
+  changes = [Changelist(branchref=b, auth_config=auth_config)
+              for b in branches.splitlines()]
+  alignment = max(5, max(len(c.GetBranch()) for c in changes))
+  statuses = get_cl_statuses(changes,
+                             fine_grained=True,
+                             max_processes=options.maxjobs)
+  proposal = [(cl.GetBranch(),
+               'submitted-%s-%s' % (cl.GetBranch(), cl.GetIssue()))

[tandrii(chromium), 2016/05/31 18:46:16]

WDYT about "git-cl-closed-%s-%s"?
This way it's much less likely to conflict with tags from upstream, and also
less confusing, as closed != submitted (or landed in Rietveld jargon).

[Kevin M, 2016/05/31 20:05:21]

Done.

+              for cl, status in statuses
+              if status == 'closed']
+
+  if len(proposal) == 0:
+    print 'No closed branches found.'

[tandrii(chromium), 2016/05/31 18:46:16]

WDYT about 'No branches with closed codereview issues found'?

[Kevin M, 2016/05/31 20:05:21]

Done.

+    return 0
+
+  print '\nBranches with closed issues that will be tagged and deleted:'
+  print "%*s | %s" % (alignment, "Branch name", "Archival tag name")

[tandrii(chromium), 2016/05/31 18:46:16]

nits: single quotes (s/"/')

[Kevin M, 2016/05/31 20:05:21]

Done.

+  for next_item in proposal:
+    print '%*s   %s' % (alignment, next_item[0], next_item[1])
+
+  prompt = None
+  if not options.force:
+    prompt = raw_input('\nProceed with deletion (Y/N)? ')

[tandrii(chromium), 2016/05/31 18:46:16]

s/raw_input/ask_for_data

and how about exiting immediately here if prompt didn't return "y":
if not options.force:
  if ask_for_data(...).lower() != 'y':
    print 'Aborted.'
    return 1

for branch, tagname in proposal:
  ...

[Kevin M, 2016/05/31 20:05:21]

That looks better, done.

+  if prompt == 'Y' or prompt == 'y' or options.force:
+    for next_item in proposal:
+      branch, tagname = next_item

[tandrii(chromium), 2016/05/31 18:46:16]

combine this and above:
for branch, tagname in proposal:

[Kevin M, 2016/05/31 20:05:21]

Done.

+      RunGit(['tag', tagname, branch])
+      RunGit(['branch', '-D', branch])
+    print '\nJob\'s done!'
+  else:
+    print 'Aborted.'
+
+  return 0
 
 def CMDstatus(parser, args):
   """Show status of changelists.
 
   Colors are used to tell the state of the CL unless --fast is used:
     - Red      not sent for review or broken
     - Blue     waiting for review
     - Yellow   waiting for you to reply to review
     - Green    LGTM'ed
     - Magenta  in the commit queue
@@ skipping 1801 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()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)