Commit Graph

957 Commits (45d8db04f9926e6a0edcd223e0b3e4e485641150)
 

Author SHA1 Message Date
maruel@chromium.org 0350706c3c Fix retry mechanism to raise when it fails to checkout.
TBR=jochen
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@63832 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
scottbyer@chromium.org 7526fe3b28 A refactoring left cygwin busted.
Create an update_depot_tools.bat file to use for updated when on cygwin, and
properly call it from the update_depot_tools shell script and gclient batch
files.

BUG=none
TEST=gclient sync and git cl work again on cygwin.  Can also turn echo on in update_depot_tools.bat to verify updating working correctly.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@63234 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org b153d873cf Handle gclient_utils.Error exceptions in trychange.py
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@63047 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 2a94904744 Isolate depot_tools update into a separate script.
Also, modify git-cl to also update depot_tools. Otherwise, the git-cl
script never gets updated for folks that only use git-cl but
not gclient. This fixes a bug ChromiumOS developers are currently seeing
where there git-cl checkout is still pointing to src.chromium.org
and not git.chromium.org.

BUG=none
TEST=Verified that git-cl help and gclient help work.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62948 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 37801da395 Change git-cl wrapper script to automatically fix the git_cl_repo remote url.
This is nicer than an error message.

TEST=manually tested the url was overwritten
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62923 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 45e9f2d2f8 Return a meaningful error message when no arg is given to gclient recurse.
It's better than throwing an exception.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62921 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 78cba52586 gclient recurse fails if .gclient_entries doesn't exist.
Prints a meaningful message instead of throwing an exception.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62920 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
chase@chromium.org 733bc0fa18 Update git-cl to use git.chromium.org.
BUG=none
TEST=git-cl works
TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/3757006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62916 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 09c0dba98f Fix a None reference exception when searching for presubmit scripts.
It happens when a user uses --diff foo.diff so the list of file is not defined.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62547 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org e4a99006a8 Fix trychange.py --dry_run to do what the doc says.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62541 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 04dd7deb6b Fix "No SCM found for url None" error that can occur after update
This occurs when gclient compares the cached deps in .gclient_entries
to the new DEPS and tries to construct an SCM for any cached entries
which no longer exist. In this situation gclient doesn't account for
the case where previous entries may have been ignored by setting their
url to None via the custom_deps section in .gclient.

Contributed by Jay Soffian.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62540 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
mattm@google.com 90a685ef1a Fix finding path to gcl when drover is run with a relative path.
BUG=none
TEST=cd ../tempdir && ../depot_tools/drover <some args>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62497 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ac61023c2c Fix a bug in gclient recurse for git-svn users. Make gclient_utils.CheckCall more versatile.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62400 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org ed8b178cfa git_cl_hooks: get cl fields vi git_cl accessors instead of using backquote
This is part 2 of a 2-part change which fixes a bug where git-cl
hangs if ~/.codereview_upload_cookies does not exist. It is
actually waiting on user input for email/password (but you don't see the
prompt because it's happening in a subprocess).

This is a do-over of http://codereview.chromium.org/3622002.

Much thanks to Lei Zhang for fixing the bugs in the original CL. His
fixup CL was http://codereview.chromium.org/3541019.

BUG=none
TEST=Verified that the hang is fixed.

Wrote a quick pre-submit to test that issue and patchset are ints:
    http://codereview.chromium.org/3533020

Output:

** Presubmit Warnings **
Patchset is 1

Issue is 3533020

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61957 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org b718983da5 Revert "git_cl_hooks: get cl fields vi git_cl accessors instead of using backquote"
TBR=maruel
BUG=none
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61883 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 3f71d6ed73 git_cl_hooks: get cl fields vi git_cl accessors instead of using backquote
This is part 2 of a 2-part change which fixes a bug where git-cl
hangs if ~/.codereview_upload_cookies does not exist. It is
actually waiting on user input for email/password (but you don't see the
prompt because it's happening in a subprocess).

BUG=none
TEST=Verified that the hang is fixed.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61822 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
bauerb@chromium.org 4acf742e90 Fall back to our own codereview settings if a key is not found in gcl's settings.
Otherwise, git try breaks for some users.

Also, make testUpdateCheckout pass if the path to the temp directory contains a symlink (like on Mac OS X).

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61786 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
joi@chromium.org 42c7f66733 Reuse gcl.py's code review settings when running [gcl try], as gcl is
smarter about finding the most appropriate settings file.

Before this change, I inadvertently did a [gcl try] on a chrome-internal
change (it was a trivial change and not really secret, so no harm done).
After this change, that won't be possible.

Also, change breakpad to not upload the exception that is thrown when 
the user fails to provide correct log-on credentials.

TEST=none
BUG=none


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61738 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org afccd0a8f8 Update .gitignore to ignore git_cl_repo that was renamed in 61694.
TEST=none
BUG=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61734 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 55a2eb8871 Display the name of the repository that is being updated.
Patch contributed by Anton Staaf.

BUG=None
TEST=run "gclient config ...; gclient sync chromium"

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61733 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org b48f2298b2 git-cl: change the git-cl-repo dir to git_cl_repo so that we can import
python does not seem to be able to import for a dir with dashes in it.

BUG=none
TEST=Ran git-cl help and verified it worked and new dir was created.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61694 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a116e7d373 Workaround to disable Progress() on buildbot by disabling it on --verbose.
sys.stdout.isatty() is True even on buildbot.
Otherwise, logs can't be untangled when using --jobs.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61552 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 795a8c1d0a Fix gclient_scm_test that was broken in r61459.
Added a unit test to verify .hg detection.
Also refactor the test a bit to reduce the amount of reduncdant code.

TEST=fixed unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61551 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8d19523063 Add a note warning the users that presubmit hooks will be run.
Otherwise the scripts make it looks like they are hung when the presubmit checks
are slow.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61506 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
morrita@chromium.org 21dca0e781 Skipped syncing svn working copy which has a .hg subdirectory.
BUG=57783
TEST=none
Review URL: http://codereview.chromium.org/3601007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61459 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org cf1982cb17 Don't check number of pending builds for offline builders.
TEST=none
BUG=29953

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61371 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
thakis@chromium.org 09829bf043 Make presubmit output less annoying for mac people.
Review URL: http://codereview.chromium.org/3521006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@61277 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org c98b047266 Strip newline/whitespace from 'which' output when
looking for non-standard-named depot_tools directory
in git cl hooks python script.  Otherwise, python
ignores the path.

Patch contributed by James Jones @ nvidia.

BUG=chromium-os:7007

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@60499 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 2379632b67 Improve breakpad by adding cwd, fix str(last_tb) and dump what is sent to the user.
The user will get an idea of what data is sent.

Getting the current working directory is useful to know what checkout was used.

the repr(last_tb) call was stripping off a lot of useful information for
debugging.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@60339 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 7633e473f1 Even if HTTPError subclasses URLError, it doesn't have the member reason.
That's so pythonic. Use str() instead.

TBR=bradnelson
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@60211 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 58c1938777 Swallow HTTPError exceptions for HTTP 500 so they aren't logged in breakpad.
It doesn't give me useful information.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@60209 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 77e4ecaf59 Remove cruft from having to do bookeeping of options.stdout.
This makes the code saner to understand.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@60050 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 35db5099a4 This is still necessary.
This breaks non-ascii output on Windows but if it's not there it breaks unicode
output on all other platforms. Ah code pages...

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59966 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8071c2879c Remove unneeded parameter.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59965 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org dd057f38b5 Add automated sys.stdout check.
Had to update a few tests, removed redundant code in gclient_scm_tests.

TEST=more readable unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59959 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org cc1614be9f Improve GIT.CaptureStatus() to work with incorrectly merged local branches.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59944 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 4ed3418912 Directly hook sys.stdout for thread annotated output.
In the next change, we can now remove all the options.stdout bookeeping since
it's not unnecessary.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59795 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org e0de9cbe0f Remove the class StdoutAnnotated and clones the object instead.
The end goal is to remove options.stdout, to remove a lot of bookkeeping.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59792 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8aba5f7305 Add a nice message for cygwin users, telling them to rebase when necessary.
BUG=53483
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59699 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 53ac33523c Make git-try behave like calling trychange.py directly.
That fixes the common usage "git-try <branch>" so the diff is generated against
a branch.

BUG=46697
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59550 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1309f81f51 Revert back to use exec() instead of execfile().
It seems execfile() has different properties than exec().

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59407 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8ea22292b7 Fix code that is causing a pylint error in drover.py.
The previous 'fix' would fail if drover.properties would contain FILE_PATTERN = None
or something similar.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59254 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1e629b3bd7 Fix presubmit check for depot_tools on linux and mac.
The class WindowsError is only a builtin on Windows. Use OSError instead.
Also make the exception more comprehensible on the other platforms when
pylint is not installed.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59253 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org 7d1ce06e64 Fix a break in drover.py that prevented webkit merges.
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59179 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org aef9e440f2 Fixes the remaining failures gclient_smoketest on Windows.
TBR'ing since the change is fairly trivial.

TBR=bradnelson
TEST=moar tests fixed
BUG=none
Review URL: http://codereview.chromium.org/3329023

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59148 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org fac9d3d690 Give up on parallel checkout by default.
It hoses the chromium slaves on build.webkit.org.
It was fun while it lasted.

TBR=bradnelson
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59146 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 5631746743 Improve the testing situation on Windows.
For now that involves disabling a lot of tests when they can't be run.

I'm unsure about the ascii encoding, it fails here if I keep this call on a French UI.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3333028

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59137 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 5f2a196ca6 Change the way to detect build slave.
It seems sys.stdout.isatty() is not a good signal on the build slaves.

TBR=bradnelson
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59131 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org e75e8e683c Add a cheap trick to disable parallel sync on the buildbot until they are fixed.
This way engineers can still enjoy the perf benefit while someone fixes the
buildbot stdio parsing issue.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59127 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 0d2bf39ca9 Revert parallel checkout as the default.
This is because buildbot can't parse gclient output with parallel checkout,
causing got_revision to not be set, causing some scripts to fail.

TBR=bradnelson
TEST=none
BUG=none

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

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