From abbaa843f4ad9d7252255a652aaf3a99696d27fe Mon Sep 17 00:00:00 2001
From: "pgervais@chromium.org"
 <pgervais@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 25 Jul 2014 14:30:33 +0000
Subject: [PATCH] Removed git cl push command

The user message says the subcommand will stop working on July 1.

BUG=

Review URL: https://codereview.chromium.org/396233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@285586 0039d316-1c4b-4281-b951-d872f2087c98
---
 git_cl.py           | 23 -----------------------
 tests/push-basic.sh |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/git_cl.py b/git_cl.py
index a2bc0ffbe..738370953 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -7,7 +7,6 @@
 
 """A git-command for integrating reviews on Rietveld."""
 
-import datetime
 from distutils.version import LooseVersion
 import glob
 import json
@@ -19,7 +18,6 @@ import re
 import stat
 import sys
 import textwrap
-import time
 import threading
 import urllib2
 import urlparse
@@ -2070,27 +2068,6 @@ def CMDland(parser, args):
   return SendUpstream(parser, args, 'push')
 
 
-@subcommand.usage('[upstream branch to apply against]')
-def CMDpush(parser, args):
-  """Temporary alias for 'land'.
-  """
-  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"
-    "=======\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 :-)')
-    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."""
diff --git a/tests/push-basic.sh b/tests/push-basic.sh
index 51a74f0cc..b68f8045b 100755
--- a/tests/push-basic.sh
+++ b/tests/push-basic.sh
@@ -47,8 +47,8 @@ setup_gitgit
   test_expect_success "Base URL contains branch name" \
       "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:[[:space:]]*[^<]' | grep -q '@master'"
 
-  test_expect_success "git-cl push ok" \
-    "$GIT_CL push -f"
+  test_expect_success "git-cl land ok" \
+    "$GIT_CL land -f"
 
   git checkout -q master > /dev/null 2>&1
   git pull -q > /dev/null 2>&1