Commit abbaa843 authored by pgervais@chromium.org's avatar pgervais@chromium.org

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
parent e98e04cb
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
"""A git-command for integrating reviews on Rietveld.""" """A git-command for integrating reviews on Rietveld."""
import datetime
from distutils.version import LooseVersion from distutils.version import LooseVersion
import glob import glob
import json import json
...@@ -19,7 +18,6 @@ import re ...@@ -19,7 +18,6 @@ import re
import stat import stat
import sys import sys
import textwrap import textwrap
import time
import threading import threading
import urllib2 import urllib2
import urlparse import urlparse
...@@ -2070,27 +2068,6 @@ def CMDland(parser, args): ...@@ -2070,27 +2068,6 @@ def CMDland(parser, args):
return SendUpstream(parser, args, 'push') 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>') @subcommand.usage('<patch url or issue id>')
def CMDpatch(parser, args): def CMDpatch(parser, args):
"""Patches in a code review.""" """Patches in a code review."""
......
...@@ -47,8 +47,8 @@ setup_gitgit ...@@ -47,8 +47,8 @@ setup_gitgit
test_expect_success "Base URL contains branch name" \ test_expect_success "Base URL contains branch name" \
"curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:[[:space:]]*[^<]' | grep -q '@master'" "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:[[:space:]]*[^<]' | grep -q '@master'"
test_expect_success "git-cl push ok" \ test_expect_success "git-cl land ok" \
"$GIT_CL push -f" "$GIT_CL land -f"
git checkout -q master > /dev/null 2>&1 git checkout -q master > /dev/null 2>&1
git pull -q > /dev/null 2>&1 git pull -q > /dev/null 2>&1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment