git cl archive: Add "--dry-run" and "--notags" flags.

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 __future__ import print_function
@@ skipping 3247 matching lines @@
     print('  %s : %s' % (dependent_branch, upload_status))
   print()
 
   return 0
 
 
 def CMDarchive(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')
+      help='The maximum number of jobs to use when retrieving review status.')
   parser.add_option(
       '-f', '--force', action='store_true',
       help='Bypasses the confirmation prompt.')
+  parser.add_option(
+      '-d', '--dry-run', action='store_true',
+      help='Skip the branch tagging and removal steps.')
+  parser.add_option(
+      '-t', '--notags', action='store_true',
+      help='Do not tag archived branches. '
+           'Note: local commit history may be lost.')
 
   auth.add_auth_options(parser)
   options, args = parser.parse_args(args)
   if args:
     parser.error('Unsupported args: %s' % ' '.join(args))
   auth_config = auth.extract_auth_config_from_options(options)
 
   branches = RunGit(['for-each-ref', '--format=%(refname)', 'refs/heads'])
   if not branches:
     return 0
@@ skipping 11 matching lines @@
               if status == 'closed']
   proposal.sort()
 
   if not proposal:
     print('No branches with closed codereview issues found.')
     return 0
 
   current_branch = GetCurrentBranch()
 
   print('\nBranches with closed issues that will be archived:\n')
-  print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
-  for next_item in proposal:
-    print('%*s   %s' % (alignment, next_item[0], next_item[1]))
+  if options.notags:
+    for next_item in proposal:
+      print('  ' + next_item[0])
+  else:
+    print('%*s | %s' % (alignment, 'Branch name', 'Archival tag name'))
+    for next_item in proposal:
+      print('%*s   %s' % (alignment, next_item[0], next_item[1]))
 
-  if any(branch == current_branch for branch, _ in proposal):
+  # Quit now on precondition failure or if instructed by the user, either
+  # via an interactive prompt or by command line flags.
+  if options.dry_run:
+    print('\nNo changes were made (dry run).\n')
+    return 0
+  elif any(branch == current_branch for branch, _ in proposal):
     print('You are currently on a branch \'%s\' which is associated with a '
           'closed codereview issue, so archive cannot proceed. Please '
           'checkout another branch and run this command again.' %
           current_branch)
     return 1
-
-  if not options.force:
+  elif not options.force:
     answer = ask_for_data('\nProceed with deletion (Y/n)? ').lower()
     if answer not in ('y', ''):
       print('Aborted.')
       return 1
 
   for branch, tagname in proposal:
-    RunGit(['tag', tagname, branch])
+    if not options.notags:
+      RunGit(['tag', tagname, branch])
     RunGit(['branch', '-D', branch])
+
   print('\nJob\'s done!')
 
   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
@@ skipping 1868 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)