Commit Graph

1387 Commits (4949dabad0f29ce1e70fd137e369a38fe7460377)
 

Author SHA1 Message Date
bradnelson@google.com 4949dabad0 Avoid parallel sync in general on arm boards.
Previous attempts inside the buildbot config missed some places.
This just does it directly in gclient.

Review carefully, this is a depot_tools change.

BUG=None
TEST=None
R=maruel@chromium.org,dschuff@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132997 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
mukai@chromium.org 9e3e82c1b3 Check binary existence in gclient: 2nd try.
The first approach crrev.com/132446 was reverted due to
Windows build breaks. This approach is more robust because
it actually tests the binary by running the command actually.

BUG=114483
TEST=succeeded on Linux

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132783 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 2a0108ebdb Revert r132446 "Check the existence and executability of scm commands"
This completely broke syncing on Windows.

TBR=mukai@chromium.org
BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/9956149

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132451 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
mukai@chromium.org d15a8fa135 Check the existence and executability of scm commands
BUG=114483
TEST=manually

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132446 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org c7bf35f030 Add support for launching windows ninja from cygwin.
Shell through to the .bat to make sure the environment is correctly set up. Not sure if there's a better uname to check?
Review URL: https://chromiumcodereview.appspot.com/10024045

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132252 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org a90bc037fc Wrap ninja invocation to include python in path, and set up compiler environment before invoking the ninja binary itself (which is moved to a subdirectory).
Review URL: https://chromiumcodereview.appspot.com/9967020

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132239 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org e6c00f3f6f Fix git depot_tools update flow.
In Windows (already worked correctly in posix): gclient wouldn't correctly update depot_tools when called.

Refactored away the bootstrap depot_tools update flow which only still existed in Windows.

Patch contributed by gab@chromium.org

R=maruel@chromium.org
BUG=
TEST=Running `gclient sync` from src/ and see depot_tools being correctly updated under a git depot_tools checkout.

Review URL: https://chromiumcodereview.appspot.com/9751009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@132191 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
nsylvain@chromium.org f9b1fdb961 Fix the warning in gcl to tell people they can use the commit queue.
BUG=115148

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@131313 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org cb5e57ca95 Ensure .mk files aren't included in the tab character check.
R=maruel@chromium.org
TEST=presubmit checks pass

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@131171 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 1353e9f4d2 Update ninja binaries.
Fixes regression in includes filtering for ninja-deplist-helper.

TBR=maruel
Review URL: https://chromiumcodereview.appspot.com/9982010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@130677 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
kliegs@chromium.org 6ecb27e5c8 Add *.ebuild to the list of files git-gs will search.
git-gs wasn't finding matches in the chromiumos-overlays
repo as most of the files there are .ebuild.  This fixes that.

BUG=None
TEST='git gs KEYWORDS' now returns matches

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@130397 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
kalmard@homejinni.com 6b0051e7c6 Allow overriding base-url in git-cl.
This is useful if git-cl has no way to find out the original svn repo's url
and the user does not wish to configure git-svn and fetch the repository.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@130372 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rch@chromium.org 92d67165eb Allow longer branch names to be center justified with git cl status.
(Using "." instead of " " so that codereview shows the alignment)

Before:

% git cl status  
Branches associated with reviews:
..CloseIdleSpdySessions:.None
..CloseSockets:.9755011
..GetNegotiatedProtocol:.9958028
..LayeredSocketPool:.9861032
..ReleaseIdleSpdySessions:.9733017
..SSLClientSocket:.9616019
.......Spdy3:.9958023
...SpdyProxy:.None
...SpdyTests:.None
.......crash:.9809033
........leak:.None
......master:.None
.......spdy3:.9958023

After

% git cl status
Branches associated with reviews:
......CloseIdleSpdySessions:.None
...............CloseSockets:.9755011
......GetNegotiatedProtocol:.9958028
..........LayeredSocketPool:.9861032
....ReleaseIdleSpdySessions:.9733017
............SSLClientSocket:.9616019
......................Spdy3:.9958023
..................SpdyProxy:.None
..................SpdyTests:.None
......................crash:.9809033
.......................leak:.None
.....................master:.None
......................spdy3:.9958023

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@130189 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ferringb@google.com 0230d91ab7 Cleanup chromite_wrapper.
The original design of this had some issues:

1) forced targets to be importable via 'buildbot.cbuildbot', rather
  than the proper/full 'chromite.buildbot.cbuildbot'.  Scripts worked
  around this, but it's an unwanted limitation.

2) That importation requirement means that within the chroot, we've
  had to export cros_sdk *and* cros_sdk.py in the PATH.  This is
  undesirable clutter, and introduces potential errors as scripts
  localize themselves to cros_sdk.py rather than invoking cros_sdk
  (the consumers should be agnostic to the language the tool is
  written in).

3) chromite_wrapper enforced assumptions about python namespace w/in
  the targets- specifically that 'main' must always be invokable
  without any arguments.  This limits refactoring/cleanup in chromite
  via having to support ancient API assumptions (api's that weren't
  public); modern chromite has repurposed main changing the prototype,
  and using it's own wrapper doing signal handler setup, and general
  framework behaviour.  Longer term, that 'main' functor is unlikely
  to even exist.  The strong coupling chromite_wrapper forced limits
  are refactoring possibilities.

4) In modern chromite, all user consumable tools are now required to
  exist w/in chromite/bin/, and be executable and invokable.  This is
  what we want going forward.

5) Implied we want chromite_wrapper used w/in the chroot; we don't,
  thus drop all CROS_WORKON_SRCROOT awareness.

6) Exposed a chromite_wrapper invokable (that didn't work) into the
  PATH outside the chroot; this is resolved via moving it into a
  support directory and repointing symlinks to it.

At this point, if it's working with a modern chromite checkout the
script is a simple execv pass thru.  If it isn't, then it will fallback
to the old import trickery.

This has been tested against R16, R17, R18, ToT, 0.11.241.B, factory-*,
basically all branches w/in chromite without issue.




git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@128555 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jmbaker@chromium.org a2cbbbb35e Choosing a default remote for determining base_url.
BUG=116057

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@128293 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ferringb@google.com c6a9cb2fcf Drop chromite command.
It was gutted from ToT, and was broke for a fairly long time
prior to that- nothing uses it in this fashion.

BUG=None
TEST=N/a

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@128076 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 40b7687d19 Add median latency to my_reviews.py. Do more calculation on the fly.
R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@127856 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bauerb@chromium.org 4cea01ef65 Allow 'class Singleton<T>' in header files.
BUG=none
TEST='friend class Singleton<T>' is allowed.


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@127751 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
groby@chromium.org eebfb7541d Added depot_tools/git-utils, added util to prune dead git branches
Review URL: http://codereview.chromium.org/9657005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@127515 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
pam@chromium.org aba6776889 Add a message that the list of directories needing owners may not be accurate on first upload, because we have no way to know whether the user is an OWNER for any of them.
BUG=117974
TEST=covered by presubmit unit tests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@126894 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 2465527f42 Update ninja windows binaries to latest version.
Work on faster dependency database, noisyness filtering, faster mtime.

TBR=maruel

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@126530 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@google.com 873e6672e1 If a subdir exists and is empty, go ahead and clone into it.
This will make it easier to support git-submodule and gclient at
the same time.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@126428 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@google.com b9a78d31ba Added `gclient hookinfo`. This will be used to convert hooks into
repo post-sync hooks.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@126426 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 3ecc8ea477 Adds saner behavior for git try -t foo to not fail in a inexplicable way.
Enforces that each builder and builder:test association must be in its own list item in PRESUBMIT.py/GetPreferredTrySlaves().

If a user run git try -t foo, trychange.py will now take the list of all the
slaves, will skip any :compile builder, and apply the test filter to them.

Currently, git try -t foo on a chromium checkout throws an exception because of
PRESUBMIT.py files containing test specification.

R=petermayo@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@125975 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 8a06be6b3c depot_tools doesn't support python 2.5 anymore.
Remove the stale presubmit warning.

TBR=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@125696 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 9eef4f27d0 Fix support for --bot bot1,bot2 -t foo
Previously, it would apply the test filter only on the last bot.

TBR=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@125622 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
pam@chromium.org f46aed992a Show a list of directories missing OWNER reviewers on upload, and show directories rather than files missing OWNER approvals on commit.
BUG=117166
TEST=covered by presubmit unittests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@125588 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org dd44794218 Stop sending the testfilter= flag to the try server and process it locally.
The previous behavior would cause inproper parsing;
- the bot=bot1 flag would add 'bot1': ['defaulttests'] to the dictionary.
- the testfilter=test1 flag would append 'test1' to the list, causing the value
  to look like 'bot1': ['defaulttests', 'test1'].

I think on the long run the best is to keep --testfilter as a user interface but
not on the try server. This effectively stops sending testfilter=foo to the
server.

Add unit test to verify it's working properly. Refactor a bit to make unit
testing simpler.

R=petermayo@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@125405 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ce8d3a2afc Add petermayo@chromium.org. We always need more OWNERS.
TBR=petermayo@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@125276 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 288054dae1 Add --ignore to gclient recurse
This permits running git grep over the dependencies. With --ignore, gclient
recurse continues even if nothing is found in a dependency. Without this flag,
git grep returns 1 when nothing is found, causing gclient to stop processing the
remaining dependencies.

TBR=nsylvain@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@124914 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
davidbarr@chromium.org 47ca0ee560 Rework gclient 'recurse' command to use a WorkQueue.
Support --jobs in 'fetch' and 'recurse' commands. 

BUG=115840
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@124657 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
davidbarr@chromium.org 12f944e327 Add 'fetch' command to gclient with support for --jobs.
The fetch command is simply an alias for:
gclient recurse -s git git fetch origin

Rework 'recurse' command to use a WorkQueue so that --jobs is supported.

BUG=115840
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@124334 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 4699a007bc Update ninja win32 binaries.
- Support quiet option on ninja-deplist-helper.
- Add "overprint" mode to ninja when attached to a console.
- Fix slash handling in creating output directories.
- Merge response file support from master branch
Review URL: https://chromiumcodereview.appspot.com/9539015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@124266 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 58733288cd Fix workaround for ErrorExit().
r123775 contained copy-paste left-over that caused the code to throw a NameError
instead of a HTTPError.

R=petermayo@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@124184 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org a01fd324f9 Convert ErrorExit() calls back into an HTTPError exception so it can be properly handled.
Occasionally, AppEngine throws HTTP 500. In practice it's not a big deal but
upload.py converts them into sys.exit() call which is problematic. This breaks
the commit queue since this behaviors forces the CQ to quit.

R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123775 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ffcc161fd0 Remove flaky git tests.
The mere fact that they were each looking at two different outputs was already a
bad sign. Then, occasionally, the output would still not match exactly. This
needs to be recoded so remove these tests in the meantime.

TBR=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123743 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bashi@chromium.org fcffd48174 Fix compatibility with Xcode4.3 git
Xcode 4.3 git returns the version like below:

git version 1.7.7.5 (Apple Git-26)

Modify GIT.AssertVersion to accept such input.

Also modify tests/gclient_scm_test.py to pass tests, but not sure
the fix is collect.

BUG=chromium:115576
TEST=ran tests/gclient_scm_test.py

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123399 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottbyer@chromium.org 33167331d6 Make sure to remove color output from patches uploaded for try jobs (and other
things).

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123329 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 823259a1bf Remove a check that would break with pinned revision using ssh protocol with a user name in the url
An example use case is github over ssh at a pinned revision.

R=petermayo@chromium.org
BUG=115202
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123325 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org e83dda0510 Improve trychange.py documentation. No logic change
R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123301 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 82798cbb32 Enforce python 2.6 or later.
TBR=bevc@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123276 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 5ac27607ca Add my other alias to OWNERS since it's annoying as hell when I login with the wrong account
TBR=nsylvain@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123068 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org ed4503a209 Add ninja Windows binaries.
Built from https://github.com/sgraham/ninja/tree/deplist.
Review URL: https://chromiumcodereview.appspot.com/9372088

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@122940 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bulach@chromium.org bfffd45e89 Presubmit tests: allow 100columns limit for .java files.
Chrome for Android introduced the requirement for java files.
Android's style guide:
http://source.android.com/source/code-style.html#limit-line-length
defines 100 columns for .java files.
This patch changes the presubmit tests which are also used by chromium's CQ.

TEST=testCannedCheckJavaLongLines

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@122938 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 8fab6b66ff Fix unicode upgrade of patch.
When a diff contains utf8 character, the filename would be stored as a unicode
object instead of a str. This is even if the buffer is originally sent as a
utf-8 encoded str. Then once the diff is reconstructed to be sent to 'patch', a
unicode object instead of a str would be sent, confusing patch.

R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@122361 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
steveblock@chromium.org 98e6945846 If both -R and -D are specified when updating, remove all untracked directories
This is required to avoid the need to clobber the bots when moving a directory 
to deps/. Currently, the directory in question is likely to remain in the 
working copy, despite having been removed, due to the presence of untracked 
files. This causes the checkout from deps/ to fail. 

With this change, when both --reset and --delete_unversioned_trees are 
specified, the the directory in question will be removed from the working copy, 
thereby allowing the copy in deps/ to be checked out correctly. 

Note that untracked directories which are explicitly ignored (ie in .gitignore 
or svn:ignore) will not be removed. 

Note that this was previously landed in http://codereview.chromium.org/9348054 
but reverted due to problems with symlinks in the chromeos build. 

BUG=112887, chromium-os:20759

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@122300 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 30159da655 Revert r121986 "If both -f and -D are specified when updating, remove all untracked directories"
Caused issues with chromium.chromiumos bots.

TBR=steveblock@chromium.org
BUG=112887

TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@122098 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dbeam@chromium.org b231210c12 [depot_tools] Removing unnecessary capturing regex.
R=maruel@chromium.org
BUG=None
TEST=Copyright check still works.


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@122006 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
dbeam@chromium.org 2a75fdb0fc [depot_tools] Use git fetch to optimize the properly configured that use git-svn
in the way <http://code.google.com/p/chromium/wiki/UsingNewGit#Initial_checkout>
describes.

R=maruel@chromium.org
TEST=gclient sync with safesync_url is faster.
BUG=109184


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@121988 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
steveblock@chromium.org 93567043f9 If both -f and -D are specified when updating, remove all untracked directories
This is required to avoid the need to clobber the bots when moving a directory
to deps/. Currently, the directory in question is likely to remain in the
working copy, despite having been removed, due to the presence of untracked
files. This causes the checkout from deps/ to fail.

With this change, when both --force and --delete_unversioned_trees are
specified, the the directory in question will be removed from the working copy,
thereby allowing the copy in deps/ to be checked out correctly.

Note that untracked directories which are explicitly ignored (ie in .gitignore
or svn:ignore) will not be removed.

BUG=112887,chromium-os:20759

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

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