git cl push -> git cl land

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."""
 
+import datetime
 from distutils.version import LooseVersion
 import glob
 import json
 import logging
 import optparse
 import os
 import Queue
 import re
 import stat
 import sys
 import textwrap
+import time
 import threading
 import urllib2
 import urlparse
 import webbrowser
 
 try:
   import readline  # pylint: disable=F0401,W0611
 except ImportError:
   pass
 
@@ skipping 1709 matching lines @@
 
 def IsSubmoduleMergeCommit(ref):
   # When submodules are added to the repo, we expect there to be a single
   # non-git-svn merge commit at remote HEAD with a signature comment.
   pattern = '^SVN changes up to revision [0-9]*$'
   cmd = ['rev-list', '--merges', '--grep=%s' % pattern, '%s^!' % ref]
   return RunGit(cmd) != ''
 
 
 def SendUpstream(parser, args, cmd):
-  """Common code for CmdPush and CmdDCommit
+  """Common code for CMDland and CmdDCommit
 
   Squashes branch into a single commit.
   Updates changelog with metadata (e.g. pointer to review).
   Pushes/dcommits the code upstream.
   Updates review and closes.
   """
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-m', dest='message',
                     help="override review description")
@@ skipping 238 matching lines @@
 If your project has a true writeable upstream repository, you probably want
 to run 'git cl push' instead.
 Choose wisely, if you get this wrong, your commit might appear to succeed but
 will instead be silently ignored."""
     print(message)
     ask_for_data('[Press enter to dcommit or ctrl-C to quit]')
   return SendUpstream(parser, args, 'dcommit')
 
 
 @subcommand.usage('[upstream branch to apply against]')
-def CMDpush(parser, args):
+def CMDland(parser, args):
   """Commits the current changelist via git."""
   if settings.GetIsGitSvn():
     print('This appears to be an SVN repository.')
     print('Are you sure you didn\'t mean \'git cl dcommit\'?')
     ask_for_data('[Press enter to push or ctrl-C to quit]')
   return SendUpstream(parser, args, 'push')
 
 
+@subcommand.usage('[upstream branch to apply against]')
+def CMDpush(parser, args):
+  """Temporary alias for 'land'.

[szager1, 2014/05/01 21:11:11]

One-line comment (move trailing """ up).

+  """
+  print(
+    "\n=======\n"
+    "'git cl push' has been renamed to 'git cl land'.\n"
+    "Currently they are treated as synonyms, but 'git cl push' will stop\n"
+    "working after 2014/07/01.\n"

[Nico, 2014/07/16 17:53:52]

Why stop supporting the old thing, and why print this at all?

+    "=======\n")
+  now = datetime.datetime.utcfromtimestamp(time.time())
+  if now > datetime.datetime(2014, 7, 1):
+    print('******\nReally, you should not use this command anymore... \n'
+    'Pausing 10 sec to help you remember :-)')

[szager1, 2014/05/01 21:11:11]

Better, I think, to hang at the terminal:

sys.stdout.write('Press Return to continue...')
sys.stdin.readline()

+    for n in xrange(10):
+      time.sleep(1)
+      print('%s seconds...' % (n+1))
+    print('******')
+  return CMDland(parser, args)
+
+
 @subcommand.usage('<patch url or issue id>')
 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.')
@@ skipping 538 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 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()
   sys.exit(main(sys.argv[1:]))