Commits · 37ca0b1cdd548afdf8b340748a8d294156030a4b · Linshizhi / Chromium_Depot_tools

23 Oct, 2011 3 commits

maruel@chromium.org authored Oct 23, 2011

R=dpranke@chromium.org
BUG=
TEST=


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

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

37ca0b1c

Reapply r106708 "Include initial use of colorama" · da78c6f1

maruel@chromium.org authored Oct 23, 2011

isatty() wasn't defined on Windows, causing it to crash.

R=dpranke@chromium.org
BUG=
TEST=manually gclient sync on windows


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

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

da78c6f1

Improve the sys.stdout proxy to be more transparent. · 042f0e73

maruel@chromium.org authored Oct 23, 2011

Otherwise isatty() could not be proxied correctly.

R=dpranke@chromium.org
BUG=
TEST=


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

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

042f0e73

21 Oct, 2011 3 commits

Revert "Include initial use of colorama" · d8aba2ce

maruel@chromium.org authored Oct 21, 2011

Crashes.

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

d8aba2ce

Include initial use of colorama · 037bd188

maruel@chromium.org authored Oct 21, 2011

For now only affect gclient help to figure out if there is any issue with it.

Because of the way it's done, there is no way to disable coloring, which could
be annoying when redirected. This needs to be taken in consideration.

R=dpranke@chromium.org
TEST=manually tested on linux, cygwin and windows, both run manually and
redirected to a text file.
BUG=


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

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

037bd188

Fix subprocess2.Popen() logging when given a string · 55156559

maruel@chromium.org authored Oct 21, 2011

R=dpranke@chromium.org
BUG=
TEST=


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

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

55156559

20 Oct, 2011 3 commits

Fix a concurrency issue happening with deep dependencies when the intermediary · 6c48a304

maruel@chromium.org authored Oct 20, 2011

directory doesn't exist, on fresh checkout and --jobs >1.

It happens in the case where there is 3 dependencies:
a
a/b/c/d
a/b/c/e

'a' is processed first. Then 'a/b/c/d' and 'a/b/c/e' are fired simultaneously.
If both are not present, both svn checkout tries to mkdir b and b/c and a race
condition occurs between their call for isdir() and mkdir().

This works around the issue by creating the intermediary directories ourself
before calling out svn and managing the error ourself.

TBR=dpranke@chromium.org
BUG=
TEST=fresh checkout shouldn't be flaky


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

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

6c48a304

Revert r106358 "Get rid of RunShell*() functions in gcl.py to finish the conversion to subprocess2" · 97335088

maruel@chromium.org authored Oct 20, 2011

This eats stdout while gcl is committing, which is annoying. It needs tee-like
support first. Will revisit this change later, reverting in the meantime.

TBR=dpranke@chromium.org
BUG=
TEST=


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

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

97335088

Workaround a limitation in cygwin with Lock creation. · 4901daf1

maruel@chromium.org authored Oct 20, 2011

Reuse a common lock to reduce the number of locks created. Poor cygwin users.

R=dpranke@chromium.org
BUG=
TEST=


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

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

4901daf1

19 Oct, 2011 4 commits

Disable parallel sync on cygwin since it's flaky for users. · 41071614

maruel@chromium.org authored Oct 19, 2011

R=dpranke@chromium.org
BUG=
TEST=


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

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

41071614

Get rid of RunShell*() functions in gcl.py to finish the conversion to subprocess2 · db0ee6f1

maruel@chromium.org authored Oct 19, 2011

R=dpranke@chromium.org
BUG=
TEST=


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

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

db0ee6f1

Remove the --jobs option to recurse · f2ff948d

maruel@chromium.org authored Oct 19, 2011

It's not supported at the moment and it's misleading.

Support for it should be added eventually.

R=dpranke@chromium.org
BUG=
TEST=


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

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

f2ff948d

Improve error message when the upstream branch is wrong. · 2b38e9cd

maruel@chromium.org authored Oct 19, 2011

Otherwise, I get a stack trace, which is annoying. Here's an example:

$ git cl upload
Current branch help_text is up to date.

Failed to diff against upstream branch refs/heads/foo!

This branch probably doesn't exist anymore. To reset the
tracking branch, please run
    git branch --set-upstream help_text trunk
replacing trunk with origin/master or the relevant branch


R=dpranke@chromium.org
BUG=
TEST=


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

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

2b38e9cd

18 Oct, 2011 1 commit

gclient would crash when .gclient is not found. · 93a9ee0f

maruel@chromium.org authored Oct 18, 2011

Fix a problem introduced in r105229.

R=cmp@chromium.org
BUG=
TEST=


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

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

93a9ee0f

14 Oct, 2011 1 commit

Do not sort solutions anymore, only dependencies specified in DEPS files. · b9be065a

maruel@chromium.org authored Oct 14, 2011

Otherwise it breaks naked --revision usage. One example issue is linux_chromeos
applying the revision to cros_deps instead of src.

TBR=dpranke@chromium.org
BUG=100335
TEST=


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

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

b9be065a

13 Oct, 2011 6 commits

Prepare to make --revision <number> to be an error when multiple solutions are present. · 69392e7c

maruel@chromium.org authored Oct 13, 2011

It will help catch issues like the one we are getting on linux_chromeos where
the ordering of the solution is now by name, causing the default solution to be
used for --revision being the wrong one.

R=dpranke@chromium.org
BUG=
TEST=


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

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

69392e7c

Update default --jobs argument to 8 · 9d9f2101

maruel@chromium.org authored Oct 13, 2011

BUG=60725

R=dpranke@chromium.org
TEST=


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

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

9d9f2101

Enforce --jobs 1 for all the calls in testRevertAndStatus. · a2862ded

maruel@chromium.org authored Oct 13, 2011

Note that status() and revert() need to be correctly implemented before finishing this test.

TBR=dpranke@chromium.org
BUG=
TEST=


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

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

a2862ded

Stabilize testRevetAndStatus gclient smoke test. · 5fe6d3cf

maruel@chromium.org authored Oct 13, 2011

gclient status using --job 8 by default may return the items in a different
other. Simplify the test by forcing ordering.

TBR=dpranke@chromium.org
BUG=
TEST=


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

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

5fe6d3cf

Add repo-managed checkout support to trychange.py · 13595ffa

rcui@google.com authored Oct 13, 2011

BUG=chromium-os:21286
TEST=Ran 'git-try' with/without --root=src, and with/without .gclient file

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

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

13595ffa

Add a safeguard because I always use -p 8000 by error when I mean --port 8000. · eba9b7fc

maruel@chromium.org authored Oct 13, 2011

R=dpranke@chromium.org
BUG=
TEST=


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

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

eba9b7fc

12 Oct, 2011 3 commits

Work around lock failure on cygwin. · 6f6ad136

maruel@chromium.org authored Oct 12, 2011

This is really bad but the lock is never held for a long time so it 'should' work.

R=dpranke@chromium.org
BUG=
TEST=


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

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

6f6ad136

Make revert more resilient to partial sync failure. · c0cc0871

maruel@chromium.org authored Oct 12, 2011

Improve revert to skip over non managed directory and to clobber invalid
checkouts.

R=dpranke@chromium.org
BUG=
TEST=


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

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

c0cc0871

Reapply r104938 "Make svn update not prompt during a sync." · 36ac239b

maruel@chromium.org authored Oct 12, 2011

It wasn't broken. The tree collapsed around the same time for unrelated reason.

TBR=dpranke@chromium.org
BUG=
TEST=


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

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

36ac239b

11 Oct, 2011 4 commits

Add another error code where gclient sync should retry. · 7d8b97dc

maruel@chromium.org authored Oct 11, 2011

TBR=dpranke@chromium.org
BUG=
TEST=

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

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

7d8b97dc

Revert r104938 "Make svn update not prompt during a sync." · edb6ea6e

maruel@chromium.org authored Oct 11, 2011

I'm not sure if it's causing the tree blow up but I'm not taking any chance.

TBR=dpranke@chromium.org
BUG=
TEST=

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

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

edb6ea6e

Make svn update not prompt during a sync. · 94aa50fc

maruel@chromium.org authored Oct 11, 2011

Otherwise it may hangs in various ways.

R=dpranke@chromium.org
BUG=
TEST=


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

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

94aa50fc

Stop modifiying requirements out of thread and generate it instead. · 470b543f

maruel@chromium.org authored Oct 11, 2011

This fixes GClientSmokeBoth.testMultiSolutionsJobs flakiness by having
consistent ordering.

Now no out of thread modification is ever done, which result in much saner code.

R=dpranke@chromium.org
BUG=60725
TEST=tested manually with gclient sync --jobs 100 on chrome and with
gclient_smotetest.py


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

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

470b543f

10 Oct, 2011 6 commits

Have the DEPS only parsed in the relevant thread. · 3223edd5

maruel@chromium.org authored Oct 10, 2011

This means parsing the DEPS file all the time preemptively in case it's needed
for a From() reference. This could break certain checkout, we'll see.

R=dpranke@chromium.org
BUG=
TEST=


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

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

3223edd5

Enforce port being a number · 36c8b949

maruel@chromium.org authored Oct 10, 2011

R=dpranke@chromium.org
BUG=
TEST=


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

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

36c8b949

Move mutation in run() at the end. · baa7be38

maruel@chromium.org authored Oct 10, 2011

Also, add more locking to properties.

Now most mutations are contained. Will now figure out a way to remove the
ParseDepsFile() from an unrelated thread.

R=dpranke@chromium.org
BUG=
TEST=


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

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

baa7be38

Move all mutations into a specific place. · 0bcfd180

maruel@chromium.org authored Oct 10, 2011

This makes coherency checks more consistent for DEPS vs .gclient.

It's still not thread safe but the mutation code paths are easier to follow.

R=dpranke@chromium.org
BUG=
TEST=


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

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

0bcfd180

Do not throw an exception if git cl rebase fails. · 75075573

maruel@chromium.org authored Oct 10, 2011

Otherwise I get a stack trace and it's annoying as hell.

R=dpranke@chromium.org
BUG=
TEST=


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

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

75075573

Add assert to make sure the files argument type is valid. · e085d81a

maruel@chromium.org authored Oct 10, 2011

This would have caught a bug in the CQ instead of silently failing.

R=dpranke@chromium.org
BUG=
TEST=


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

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

e085d81a

08 Oct, 2011 1 commit

Move the logging handler hack after the last use of subprocess2 before options... · 51f44f4c

szym@chromium.org authored Oct 08, 2011

Move the logging handler hack after the last use of subprocess2 before options are parsed and logging is properly configured with basicConfig. This re-enables git try --verbose/--dry_run.

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

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

51f44f4c

07 Oct, 2011 1 commit

Restore 103787 (fix git progress message), and update test expectations. · 85d3e3ad

szager@google.com authored Oct 07, 2011

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

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

85d3e3ad

05 Oct, 2011 3 commits

Fix git --upstream_branch breakage due to removal of |file_list| param. · d32fab24

asvitkine@chromium.org authored Oct 05, 2011

Makes SCM take the |file_list| as a parameter instead of getting it from |options|.

BUG=none
TEST=none

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

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

d32fab24

Remove |file_list| parameter from |TryChange()|. · 2896eda9

asvitkine@chromium.org authored Oct 05, 2011

BUG=none
TEST=Run unit tests - they should still pass. Run gcl try and git try and make sure there are no errors.

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

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

2896eda9

Force requirements modification to be locked. · a91d26de

maruel@chromium.org authored Oct 05, 2011

... On my quest to make that stuff thread safe.

R=dpranke@chromium.org
BUG=
TEST=


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

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

a91d26de

04 Oct, 2011 1 commit

Improve logging and ease debugging. · 1333cb3e

maruel@chromium.org authored Oct 04, 2011

While trying to fix all the multithreading issues...

R=dpranke@chromium.org
BUG=
TEST=


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

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

1333cb3e