Commit Graph

78 Commits (3294f52e76a5fd39e3cc5144c423ef61533544a3)

Author SHA1 Message Date
rdsmith@google.com d05e5fb09f 'git try': a) Give users help when they ask for it, b) Don't start try job if you don't understand the command.
BUG=none
TEST=Make change in local sandbox and confirm proper things happen on "git try help", "git try xyzzy", and "git try -b linux."

Review URL: http://codereview.chromium.org/3075009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@54374 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
cbentzel@chromium.org 2c0b77da52 Add file name and line number to trychange's log output.
Review URL: http://codereview.chromium.org/2654004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49050 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1e3b8f0d0c Certain versions of python for Windows don't support epilog in the constructor.
TBR=bradnelson

Review URL: http://codereview.chromium.org/2444001

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48610 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org d089192b11 More examples at the end of trychange.py help and move the -R flag to the right group
Review URL: http://codereview.chromium.org/2408001

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48606 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 58a7c7d3e3 Some weirdo folks have @ in their USER environment variable. Strip it off.
Review URL: http://codereview.chromium.org/2336002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48582 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a8e36cbb3a Fix a typo
TBR=jam

Review URL: http://codereview.chromium.org/2342001

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48449 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 258d17f296 Fix SCM.ReadRootFile when self.gclient_root is not yet defined
Review URL: http://codereview.chromium.org/2102004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@47426 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 28a5a52732 Makes trychange.py search harder for codereview.settings in a gclient checkout.
This fixes issues with Chromium OS checkout.

BUG=crosbug:3132.
TEST=none

Review URL: http://codereview.chromium.org/2016006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@46761 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
vandebo@chromium.org c305768692 Support --gtest_filter for try jobs.
BUG=17948
TEST=submit various try jobs with and without -t option

Review URL: http://codereview.chromium.org/1733026

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@46173 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a630bd7e2c Add a fallback to origin/trunk too when the branch is not tracked.
Raise an exception in case an upstream branch can't be found.
Fix an exception that was occuring just before when no upstream is found.

Review URL: http://codereview.chromium.org/1755018

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@46011 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 81e012ce41 Modify scm.GIT.GetUpstreamBranch to behave like git-cl.
It now defaults to origin/master when no branch is tracked.

TEST=git-try on untracked branch now doesn't result in an empty diff
BUG=none

Review URL: http://codereview.chromium.org/1739021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@45935 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1dd0eea6fc Hack to work around bad cygwin, TMP and svn interaction.
Review URL: http://codereview.chromium.org/1702012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@45852 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 34d73cbd2a Add support for svn 1.4 to trychange.py
svn 1.4 doesn't have --depth parameter support so it cannot easily do a sparse checkout.

To workaround that, use svn import instead. It's also faster.
The main caveat is that the file must have a unique name, it uses a timestamp in file name for uniqueness.

Using a subdirectory (like the user name) doesn't work in the directory already exist.

It could be worked around but that would nullify the performance improvement.

Review URL: http://codereview.chromium.org/1783009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@45811 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 6fb1090c8e e.stderr may be None
Review URL: http://codereview.chromium.org/1272003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@42505 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 57af171055 Fix support with python 2.6 without simplejson.
Review URL: http://codereview.chromium.org/1050005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@41902 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 4baa0ad6d7 Fix --webkit trychange.py option.
Review URL: http://codereview.chromium.org/669243

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@40877 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 81f6eea287 Make git-try --webkit work like it used to work.
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/570059

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@38337 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 7be5ef2ed0 Change CheckCall behavior when print_error=False
We now return the stderr half of the tuple.
This required a clean up of any usage of CheckCall and GIT.Capture.

Patch contributed by Nasser Grainawi <nasser@codeaurora.org>

Review URL: http://codereview.chromium.org/551215

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37650 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 519a8dd376 Using options.email for svn credential is not a good idea.
It breaks the use case when a dev outside corp wants to send a job's email to someone else.

Review URL: http://codereview.chromium.org/558062

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37644 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 5f423140ba Simplify submitting try jobs directly from rietveld.
trychange.py -R <review_url> is sufficient for try jobs when in a checkout directory.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/553166

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37616 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8ede00e1af Add the capability to filter out files on try job with regexp.
By default, filters out 'ChangeLog'. A pain directly coming from Webkit.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/543012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36008 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
mhm@chromium.org 346737cf13 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
15 years ago
mhm@chromium.org c2190cb26c Allow git-try to try rietveld changes directly.
Some external contributors need their CL's try'd quickly, but currently its not easy unless we patch locally. This will allow you to submit the rietveld issue number and will do the rest automatically. As well, renable the dry_run option. It was removed. 

BUG=None 
TEST=git try --issue 12345
Review URL: http://codereview.chromium.org/481006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35881 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org fd9cbbb7c4 Fix case sensitivity issues and svn move patches for --sub_rep on Windows.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/538009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35839 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 51282ec8bc append_const is not supported on python 2.4.
(which is increasingly becoming a pain to support)

TEST=gcl try --help doesn't throw an error.
BUG=none
Review URL: http://codereview.chromium.org/537004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35832 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 7538b862df Add --webkit option as a shorthand for -s third_party/WebKit.
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/536002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35830 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
bradnelson@google.com 4970aa2b74 Using the root codereview.settings seems to be a problem for NACL
(there isn't one in their repo).
They've been manually specifying --host etc for over a week.

Why the change in behavior?

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/528003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35814 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1c7db8e6ee Add "diff against" support when sending try patches.
This is mostly useful with git when diffing against arbitrary branches.

Review URL: http://codereview.chromium.org/524046

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35684 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 01d8c1d113 Fix checkout root detection for git.
Add shorthand parameters.

Stop changing the logging level in gcl and some logging changes.

Change SCM.GetCheckoutRoot() to SCM.checkout_root.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/523094

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35683 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org b6d36495b5 Add back automatic fallback to svn access when http access fails.
It was somehow ripped out by accident.

TEST=none
BUG=none
TBR=bradnelson

Review URL: http://codereview.chromium.org/515037

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35284 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org d9141bffa4 After much refactory, finally add significant functionalities to trychanges.py
Add real logging support.
Fix the patch path mungling that was broken earlier.
Add and proper refactor automatic gclient and gcl settings detection.
Factored so it is possible to add other autodetection algorithms.
Now works standalone in hybrid svn&git checkouts within a gclient meta-checkout.

TEST=bah
BUG=none
TBR=bradnelson

Review URL: http://codereview.chromium.org/517005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35218 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org f7ae6d550e Add --sup_rep support to trychange.py.
This adds the functionality to try a job spread across multiple checkouts.

TEST=fixed unit tests and tested with hybrid svn-git checkouts
BUG=none

Review URL: http://codereview.chromium.org/504085

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35168 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 3ccbf7e6b7 Factor out PathDifference into gclient_utils for a later reuse.
Make lack of email address an error.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/507072

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35167 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 6f6a801ef9 Prints errors on http protocol
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/507071

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35156 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org c308a74419 Fix a typo in scm.GIT.GetBranch() and add --dry_run to trychange.py to ease testing.
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/503085

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35155 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a93717670e Add full_move flag to GIT.GenerateDiff and Factor out FindGclientRootDir into gclient_utils.
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/501171

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35154 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 650bb1f97d Small cleanups in trychange.py
Review URL: http://codereview.chromium.org/509020

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35145 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org b24a8e1a5a Remove more logic out of trychange.py into scm.py.
The goal is to (almost) completely remove git-try.

TEST=none

Review URL: http://codereview.chromium.org/501166

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35144 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org f2f9d554d4 Move GenerateDiff into a common function.
Fix standalone trychange usage on both svn and git.
Remove implicit dependency on git-cl.

TEST=unit test

Review URL: http://codereview.chromium.org/507061

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35121 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ea8c1a9bc9 Make breakpad, gcl and presubmit_support dependencies optional
TEST=unit tests

Review URL: http://codereview.chromium.org/503068

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35072 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1811135923 Remove gclient-specific hacks from trychange into gcl.
Remove upload dependency.

This is towards making trychange.py work mostly standalone for the webkit try server.

TEST=unit tests and tested both gcl try and git-try.

Review URL: http://codereview.chromium.org/501143

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35071 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 94b1ee9dbd Factor out gcl.GetRepositoryRoot() into scm.SVN.GetCheckoutRoot()
This is to reduce trychange.py dependency on gcl.py

Review URL: http://codereview.chromium.org/502085

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35055 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 9a2f37eaf1 Remove trychange.RunCommand and replace it by gclient_utils.CheckCall.
TEST=unit tests

Review URL: http://codereview.chromium.org/502078

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35052 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 2185f0069a One liner fix.
Review URL: http://codereview.chromium.org/502075

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34984 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 0fca4f3746 Get rid of gcl.ReadFile.
Review URL: http://codereview.chromium.org/501106

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34950 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 82f2c08a5b Add breakpad support to git-try and trychange.py
Review URL: http://codereview.chromium.org/465128

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34087 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org c78f246ee4 Add scm.*.GetEmail() to retrieve the user email. Use this email for try job emails.
TEST=not much
BUG=none

Review URL: http://codereview.chromium.org/399070

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32720 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1a6e63fff6 Small cleanup
Review URL: http://codereview.chromium.org/423002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32637 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 5aeb7dd54c Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.
Noteworthy change is scm.SVN.GetFileProperty calls Capture instead of Run.

TEST=unit tests
BUG=none

Review URL: http://codereview.chromium.org/399009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32181 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 261eeb5e93 Revert 32057, 32058, 32059, 32062 because they still have unwanted side-effects.
Revert "Group SCM-specific functions in classes to simplify generalization of the interface."
Revert "Fix 2 recently introduced errors."
Revert "Fix a variable aliasing error."
Revert "Fix typo."

TBR=dpranke
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/391075

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32065 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago