From 346737cf13b6a1f7d20595d7cd7d22fc1e8d45fa Mon Sep 17 00:00:00 2001 From: "mhm@chromium.org" Date: Sun, 10 Jan 2010 05:41:24 +0000 Subject: [PATCH] Fixed issue with try where patchset is passed. The new try execution should only be triggered when a user just passes the rietveld issue number. Usually, if your branch has a working patchset already defined, it shouldn't think the user passed it. The code has been updated to force patchset to be None (not 0 or any other number) so that specific occurence wont happen again. TBR=maruel BUG=None TEST=git try, git try --issue=123, git try --issue=123 --patchset=0, should all work fine now. Review URL: http://codereview.chromium.org/542007 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35889 0039d316-1c4b-4281-b951-d872f2087c98 --- trychange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trychange.py b/trychange.py index 1efb1c8c2..c04e32915 100755 --- a/trychange.py +++ b/trychange.py @@ -569,7 +569,7 @@ def TryChange(argv, if options.files: parser.error('You cannot specify files and --diff at the same time.') options.diff = gclient_utils.FileRead(options.diff, 'rb') - elif options.issue: + elif options.issue and options.patchset is None: # Retrieve the patch from rietveld when the diff is not specified. try: import simplejson