This uses grep instead. Note that just grepping for "--force" matches other
things, e.g. "foo--force--foo", but that's a problem with the original code as
well, I think.
BUG=435729
TEST=Run gclient under msysgit bash. No error should occur.
Review URL: https://codereview.chromium.org/789353002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293340 0039d316-1c4b-4281-b951-d872f2087c98
Also, allow multiple git installations to exist side-by-side.
This makes it easier to revert back to an old version quickly.
BUG=
R=maruel@chromium.org
Review URL: https://codereview.chromium.org/203463004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258058 0039d316-1c4b-4281-b951-d872f2087c98
The git path is based on the git version, so it might change whenever git is
updated. Run git.bat instead, since that's updated with new git installs and
should always point to the right path.
The mingw logic is based on similar handling of python.bat in git-cl.
Review URL: https://codereview.chromium.org/166273024
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@252584 0039d316-1c4b-4281-b951-d872f2087c98
This is necessary so that Cygwin users have a python directory in depot_tools/,
which will soon be used by gyp_chromium.
BUG=335180
Review URL: https://codereview.chromium.org/141523009
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245704 0039d316-1c4b-4281-b951-d872f2087c98
Reason for revert:
This broke auto-updating depot_tools on Cygwin due to use of exec
Original issue's description:
> Fetch Windows tools on Cygwin and use that Python for some scripts
>
> Tested by running gclient sync a couple of times from a Cygwin shell.
>
> R=dpranke@chromium.org
> CC=scottmg@chromium.org,thakis@chromium.org,maruel@chromium.org
> BUG=335180
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=245315TBR=dpranke@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=335180
Review URL: https://codereview.chromium.org/132883007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245330 0039d316-1c4b-4281-b951-d872f2087c98
Tested by running gclient sync a couple of times from a Cygwin shell.
R=dpranke@chromium.org
CC=scottmg@chromium.org,thakis@chromium.org,maruel@chromium.org
BUG=335180
Review URL: https://codereview.chromium.org/140843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@245315 0039d316-1c4b-4281-b951-d872f2087c98
Previous code checked the exit status of 'echo' instead of 'read' to
determine if the 'read' command had timed out.
TEST=Create a mirror of depot_tools.git, git clone it, then run
./update_depot_tools, see prompt for changing the URL, wait at
least 60 seconds and verify that you get the timeout message.
R=maruel@chromium.org
BUG=
Review URL: https://codereview.chromium.org/25110004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@227427 0039d316-1c4b-4281-b951-d872f2087c98
The bash command "local myvar=$(mycommand)" has the exit status of the
bash builtin "local" rather than the exit status of mycommand. To get
the exit status of mycommand, "local myvar" should be run separately
on a previous line.
Review URL: https://chromiumcodereview.appspot.com/11308129
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169446 0039d316-1c4b-4281-b951-d872f2087c98
Until recently, no proper Git clone of depot_tools existed.
All Git clones were set up locally via git svn clone. The
way repos of that type are updated is via 'git svn rebase'.
Now, a supported Git clone of depot_tools exists. The
update process for repos of this type is via 'git fetch'
and 'git rebase'.
Modify the update_depot_tools* scripts so they can update
depot_tools for git cloned or git svn cloned methods. This
also means that git svn is no longer required, so move that
test after we check for git cloned repos.
R=maruel@chromium.org
TEST=Linux + git clone: on Linux, git clone
https://git.chromium.org/chromium/tools/depot_tools.git. Apply
and commit this patch locally. Note commit hash of HEAD. Run
'git reset --hard "HEAD^^^"'. Run
'git cherry-pick HASH_OF_UPDATE_CHANGE'. Run './update_depot_tools'.
Verify depot_tools is updated to latest available revision + this
change.
TEST=Linux + git svn clone: on Linux, git svn clone
svn://svn.chromium.org/chrome/trunk/tools/depot_tools.
Apply and commit this patch locally. Note commit hash
of HEAD. Run 'git reset --hard "HEAD^^^"'. Run 'git cherry-pick
HASH_OF_UPDATE_CHANGE'. Run './update_depot_tools'. Verify
depot_tools is updated to latest available revision + this change.
TEST=Windows command prompt + git clone: on Windows command prompt,
run Linux+git clone test, except use update_depot_tools.bat. Verify
depot_tools is updated to latest available revision + this change.
TEST=Windows command prompt + git svn clone: on Windows command
prompt, run Linux+git svn clone test, except use
update_depot_tools.bat. Verify depot_tools is updated to latest
available revision + this change.
TEST=Windows cygwin + git clone: on Windows command prompt,
run Linux+git clone test. Verify depot_tools is updated to latest
available revision + this change.
TEST=Windows cygwin + git svn clone: on Windows command
prompt, run Linux+git svn clone test. Verify depot_tools is updated
to latest available revision + this change.
Review URL: https://chromiumcodereview.appspot.com/10263004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134732 0039d316-1c4b-4281-b951-d872f2087c98
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.orgR=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
Take two at r102841.
Forgot to use $base_dir, so the .pyc files in the checkout were deleted, instead
of the ones in depot_tools. Since some slaves have very large checkouts, they
appeared as hung.
R=cmp@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8059001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@103056 0039d316-1c4b-4281-b951-d872f2087c98
Last change exhibited issues with stale .pyc files. Let's leave that bake in a
little to cleanup old .pyc files.
TBR=asvitkine@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8048014
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@102841 0039d316-1c4b-4281-b951-d872f2087c98
This change makes it possible to run 'git cl' from
a Command Prompt using only the auto-installed git
from depot_tools. It is needed because in MSysGit,
'git cl' invokes 'git' which calls 'git-cl'. While
'git-cl' is pulled from depot_tools (since it's in
PATH), depot_tools/python_bin is not in PATH, and
so we execute git_cl.py through our auto-installed
python.exe directly.
update_depot_tools is fixed so that if we find
the auto-installed svn and git in depot_tools, we
execute those directly, otherwise falling back to
calling them based on PATH.
In both git-cl and update_depot_tools, we only enable
this new behavior if uname in PATH reports a 'MINGW'
environment. This should not trigger on any other
environment where uname exists, including Cygwin which
should report 'CYGWIN'.
Review URL: http://codereview.chromium.org/7020035
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@87510 0039d316-1c4b-4281-b951-d872f2087c98
This is causing a failure with dash interpreters.
Will revert this change and do testing in that
environment before next landing.
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@86211 0039d316-1c4b-4281-b951-d872f2087c98
On at least one platform /usr/bin/env is actually not
a guaranteed method to get to bash. Fall back to using
/bin/bash for this script.
Review URL: http://codereview.chromium.org/7039045
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@86185 0039d316-1c4b-4281-b951-d872f2087c98
updated; show the real last-change revision and not the current HEAD revision.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6881049
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@82124 0039d316-1c4b-4281-b951-d872f2087c98
svn info doesn't like it when handed a symlink - you get an 'is not a working copy' error message. Unfortunately, the Mac uses BSD readlink, and doesn't have -f, so the subshell CD/PWD idiom must be used.
BUG=none
TEST=Create a symlink to depot_tools, put it early in your path, and do update_depot_tools. You should not get any 'not a working copy' error messages.
Review URL: http://codereview.chromium.org/6838001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@81323 0039d316-1c4b-4281-b951-d872f2087c98
An error message would be printed at each update_depot_tools invocation.
TBR=mhm
BUG=none
TEST=running gclient shouldn't print an error message at each invocation anymore
Review URL: http://codereview.chromium.org/6690008
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@78021 0039d316-1c4b-4281-b951-d872f2087c98
BUG=none
TEST=message appears only when new revision changes.
Review URL: http://codereview.chromium.org/6691001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77997 0039d316-1c4b-4281-b951-d872f2087c98
First step to remove cygwin dependencies. This will remove dependencies with zcsh and allow python scripts to be executed as hooks.
BUG=70550, 70549
TEST=checkout chrome with git, use git cl to upload a cl, revise a cl, commit a cl.
Review URL: http://codereview.chromium.org/6369012
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@76232 0039d316-1c4b-4281-b951-d872f2087c98
on system that don't hard code bash's path.
For example, BSD's bash lives in /usr/local/bin on freebsd & openbsd.
Patch contributed by Sevan Janiyan (venture37 at gmail)
TEST=didn't break ubuntu users
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@66124 0039d316-1c4b-4281-b951-d872f2087c98
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
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
pkasting@chromium.org
agable@chromium.org
szager@chromium.org
mmoss@chromium.org
pkasting@chromium.org
rnk@chromium.org
stuart@fivemicro.com
newt@chromium.org
ilevy@chromium.org
maruel@chromium.org
cmp@chromium.org
dpranke@chromium.org
thestig@chromium.org
nsylvain@chromium.org
mark@chromium.org
scottbyer@chromium.org
mhm@chromium.org
bradnelson@google.com
msb@chromium.org