Commit Graph

1427 Commits (ca2b8e764e406261e47bcd809577f60bda5968f0)
 

Author SHA1 Message Date
maruel@chromium.org ca2b8e764e Automatically adds quotes on Windows when necessary
So that a command like
 "git config rietveld.viewvc-url http://src.chromium.org/viewvc/chrome?view=rev&revision="
works fine.

Fix the description automatically generated for the hooks to be using the same
code than for the one presented to the user.

R=cmp@chromium.org
BUG=
TEST=Tested manually on cygwin, win32, linux


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138874 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 13a9fbe19b Add several files to .gitignore.
These files are created when using msysgit and git-cl on Windows.

R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138872 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 647798cd4c Add --help support to git-tree-prune.
Full support to tools in git-utils will be added soon

TBR=groby@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138825 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
tony@chromium.org 66bc1a5131 Fix typo in help text.
No space between -- and merge.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138562 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rogerta@chromium.org e989f19485 Change rietveld object to use new URL to download binary files. This depnds
on http://codereview.appspot.com/6221063/ which makes sure that rietveld will
upload non-image binary files.

BUG=23608
TEST=Use apply_issue.py with an issue that contains binary files, and make
sure the files download correctly.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138472 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rogerta@chromium.org f0526416ba Update upload.py @ f218528d3469
BUG=None
TEST=gcl upload now uploads any type of binary file, not just images.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138469 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@google.com 35911f7f7d Utility to create an NTFS junction point. Previously reviewed at:
https://chromiumcodereview.appspot.com/9693033/
Review URL: https://chromiumcodereview.appspot.com/10413056

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138367 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org c30dc5911b Update windows ninja binaries
Merge upstream master.

- Includes -V option to see current ninja version (120514).
- Faster build_log loading.

TBR=maruel@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10386135

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@137074 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
zork@chromium.org 04704f7b4a Readd missing unittests for owners
TEST=Run tests/owners_unittest.py


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@137041 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rogerta@chromium.org 420d3b8f0e When converting -m/--message to -t, make sure to handle the case --message=foo
correctly.  Also fix git_cl.py.

BUG=None
TEST=Make sure that the -m command line option to gcl upload/git cl upload
does not add a new message to the rietveld issue.  The string associated to the
--message argument should only be used as the patchset title.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@136922 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rogerta@chromium.org 25548ab6fc Fix gcl.py to handle new command line argument format of upload.py. gcl.py
converts -m and --message to -t.

BUG=None
TEST=When uploading a patch to rietveld, make sure no new message is added to
the CL.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@136861 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
erg@chromium.org d528f8b15d Change the python hashbang in cppint.py
Review URL: https://chromiumcodereview.appspot.com/10391070

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@136603 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 34f6855218 Improve error message in patch application failure.
Make exception PatchApplicationFailed() self printable.

R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@136091 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 8f2d2c5a88 Update ninja binaries.
Pass a valid stdin to child processes.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@136053 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 40f4ad31ef Moving a file in the same directory result in status 'R'.
Add support for this status.

R=nsylvain@chromium.org
BUG=
TEST=apply_issue.py -i 10382062 should work now


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135912 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rsleevi@chromium.org 8aeb18fb3e Support Ninja being invoked from MinGW shells
BUG=none
TEST=it works

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135873 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bauerb@chromium.org 82c8c210c3 Fix crash in owners.py.
BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135806 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 81e52d0a52 Merge upstream changes to ninja binaries.
- Nico's improvements to memchr; didn't help perf on Windows, but to avoid diverging.
- Fix bug in ninja-deplist-helper that could cause crash when growing database
  sometimes.
Review URL: https://chromiumcodereview.appspot.com/10377038

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135743 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 3da8317843 Implement proper svn copy when a file is copied, moved or renamed
R=nsylvain@chromium.org
BUG=
TEST=A basic unit test verifies history is kept

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135651 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
zork@chromium.org 046e175ff0 Output a list of suggested OWNERS reviewers when needed.
BUG=None
TEST=Change files that need OWNERS review.  Upload the patch.  Check that the warning suggests a minimum set of reviewers.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135619 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org c1cb4b95f7 Add cmp to watchlist.
TBR=maruel@chromium.org


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135563 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
johnw@google.com 5255b2d116 Attempting to fix a C:\cygwin\bin\python.exe stack trace
Review URL: https://chromiumcodereview.appspot.com/10206030

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135377 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ea15cb7791 Make checkout.*.prepare() delete the svn:ignored files.
Add corresponding support to scm.SVN.Revert() to clobber the svn:ignore'd files.

This makes the commit queue remove all the unversioned files, which could have
improved its stability. It failed in practice to improve it but it's still a
good thing to do overall.

R=petermayo@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135333 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 2c96af7d78 Trim message posted to rietveld to 10000.
Rietveld doesn't post the message when it is too large.

R=petermayo@chromium.org
BUG=
TEST=Now the CQ should stop having weird case where it doesn't post a message on
CQ failure. It was because the message was simply too long!


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135326 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
haitao.feng@intel.com 306080c46d Make gclient pack work again by not prefixing "thread_id>"
into stdout and creating the GitDiffFilterer for git repository

BUG=125894
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135324 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 36086783c0 Update ninja binaries.
Fix writing ninja log header multiple times.
Fix normalization of paths on different drives.

TBR=maruel@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10345005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134993 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 264952ad00 There is no reason to not assume that status:null isn't 'M'.
Rietveld self-corrupts its status all the time, there is not point in bailing
just because of that. So just assume it's an 'M' and it'll work fine. In any
case, the diff is properly parsed to detect what was the real operation.

Add unit test that correctly process a deleted file with status:null.

TBR=nsylvain@chromium.org
BUG=
TEST=A corrupted patchset can still be committed with the Commit Queue.


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134733 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org b9d08cece4 Handle updating depot_tools repos that are git cloned.
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
13 years ago
rogerta@chromium.org 4b37d61a9b Apply upstream changes from http://code.google.com/p/rietveld/source/detail?r=2972a6fd9a4713862609a49d6bc953ca76fa2339&name=chromium
Review URL: http://codereview.chromium.org/10269009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134574 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
thakis@chromium.org f01196a6d8 Update ninja to 9b8e55d
On Linux, I did a full ninja checkout and then ran:
python bootstrap.py
./configure.py --with-gtest=../chrome/src/testing/gtest
./ninja ninja_test
./ninja_test # (all tests passed)
strip ninja

I timed empty builds of 'chrome' with the old and the new version,
both took 1.1s for that. Binary size comparison:
121632 bytes old binary
129920 bytes new binary
I used gcc 4.4.3 to build ninja.


On Mac, I updated an existing checkout to the latest version and then ran:
CXX=../chrome-git/src/third_party/llvm-build/Release+Asserts/bin/clang++ \
./configure.py --with-gtest=../chrome-git/src/testing/gtest
./ninja
./ninja ninja_test # (all tests passed)
strip ninja

I timed empty builds of 'chrome' with the old and the new version,
both took 1.1s for that. Binary size comparison:
128976 bytes old binary
120904 bytes new binary
I used clang r155352 to build ninja. Last time I used gcc 4.2, which
explains the size drop.


The major new features in this update are:
* ninja cleans up files when interrupted mid-build
* NINJA_STATUS environment variable to tweak the status line
(see ninja manual)


Also set svn:mimetype to application/octet-stream on both files.
Review URL: https://chromiumcodereview.appspot.com/10221020/



git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134307 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
peter@chromium.org 1efccc8bc7 Add the ability to specify a target_os for gclient solutions
This ability is useful for versions of Chromium (i.e. Android) which want to
cross-compile to another platform that has a fixed set of custom dependencies.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134280 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 87b8c62911 Update ninja binaries.
Merges recent upstream changes from martine/master:
- Adds -d explain for debugging;
- Adds support for NINJA_STATUS to configure output (see ninja manual);
- Other minor fixes.

TBR=maruel@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10235008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@134119 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 0ef1b2aacc Don't set up environment for ninja if the compiler is already available
Previously when ninja.bat was run from a prompt that already had VS vars
available, it was adding them a second time. Depending on what else the user
had in the path, this could cause the path to become too long and so things at
the end wouldn't be found. To avoid this, check if the compiler is available
first, and don't run the environment set up in that case.

R=maruel@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10222010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133940 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 63265df5e4 Update Windows ninja binaries
- Automatically line break $in when writing to response files (to support ULDI).
- Some refactoring of stat daemon (still off by default)

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133862 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 6208757463 Fix an error in gclient revert where a directory is unexpected and locked
This would spurious try job failures because the gclient revert step would throw
an exception.

R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133799 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 90d6388861 Add google.appengine.api.memcache to pylint ignored list
It's member are generated and confuse pylint.

TBR=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133719 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ff9a217e26 Add disabled_warnings arg to RunPylint() and use the default pylintrc file by default.
Update pylintrc to be near the pylint 0.25.1 default file.

R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133707 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org a9eeeee9fe Remove E1101 errors generated by colorama.AnsiCodes.
Pylint fails to parse generated members in a __init__() function.

R=cmp@chromium.org
BUG=
TEST=Manually tested on linux, cygwin and windows


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133705 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 4f6852cca4 Remove python 2.5 compatibility code.
R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133265 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org e9b272ac57 Update to latest Windows ninja binaries.
- Fixes StringPiece usage in ninja-deplist-helper fixing occasional corruption
  of deps (and on gypbot)
- Includes (off by default) stat daemon

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133215 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
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