Commit Graph

1458 Commits (8a066dc684f84e3350936f4bac6fcfcb1409ed3b)
 

Author SHA1 Message Date
maruel@chromium.org 8a066dc684 Fix difference on behavior on python 2.6 on linux with open(mode='rU').
TBR=cmp@chromium.org
BUG=
TEST=manually tested gclient sync works on linux with python 2.6


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145315 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org dae209fb46 Enforce utf-8 codec on all files read and write.
Otherwise, the files are opened in 'whatever happens to be the current encoding'
which is highly system-dependent. Even if some files are not encoded with utf-8,
the status quo is even worse. So it's worth trying out.

TBR=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145306 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 9206738c68 Only call IsValidRevision() when it is a git hash.
Calling IsValidRevision('refs/head/master') will always return True.

TBR=bauerb@chromium.org
BUG=134858
TEST=Tested manually with 'managed': True


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@144786 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 8147386697 Fix skipping update for git dependency.
'git rev-parse foo' with foo being any 40 character hex string will succeed.
Strip one char to force git to do a proper hash table lookup.

TBR=bauerb@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@144481 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bauerb@chromium.org cbd20a408f Skip updating remotes if we already have the upstream revision.
This should make a `gclient sync` faster, especially on Windows, where git hangs regularly.

BUG=none
TEST=gclient sync -v doesn't print "Fetching origin" all the time


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=143898
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=143911

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@144451 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bauerb@chromium.org 91514ab28c Revert 143898 - Skip updating remotes if we already have the upstream revision.
TBR=maruel@chromium.org

BUG=none
TEST=none


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143911 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
bauerb@chromium.org f407f09f2f Skip updating remotes if we already have the upstream revision.
This should make a `gclient sync` faster, especially on Windows, where git hangs regularly.

BUG=none
TEST=gclient sync -v doesn't print "Fetching origin" all the time


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143898 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 78f5c16451 Set config option for diff.ignoreSubmodules to 'all'
Review URL: https://chromiumcodereview.appspot.com/10636015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143731 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@google.com b295158e7e update windows ninja binaries
- fix FILE* leak when updating build_log version
- push PATH into parent environment in ninja-deplist-helper

BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143663 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 9663e611c4 Hopeful fix for ninja wrapper on cygwin/mingw
(ninja.bat is now ninja.exe.)

TBR=maruel@google.com


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143627 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@google.com 2a11ada9dc Delete old windows ninja binaries
Should have been part of http://crrev.com/143525 but I fail at svn.

TBR=maruel@google.com
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143623 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
chrisha@chromium.org 1b129e551f Pass arguments to pylint child process via a pipe.
This gets around command-line length limitations.

BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143620 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
scottmg@chromium.org 319f78501f ninja.bat wrapper no longer required, update ninja binaries.
Update ninja binary with upstream:
- $in_newline instead of $in
- Improved build log format for faster loading.
Review URL: https://chromiumcodereview.appspot.com/10399040

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143525 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org f5cc4279b0 Call UpdateSubmoduleConfig() in unmanaged mode, too.
Review URL: https://chromiumcodereview.appspot.com/10635010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143474 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 37e4f23403 Use default value of 'all' for submodule.*.ignore.
Review URL: https://chromiumcodereview.appspot.com/10630010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143464 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org c6ca3a198e Give up on verifying stdout for most git gclient scm tests.
The output is dependent on git's version. This is blocking the CQ.

TBR=petermayo@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143172 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 22a6876246 Fix Pylint presubmit check.
First, the environment variable for the child process was created but not
specified to subprocess.call().

Second, third_party/logilab/__init__.py tried to initialize itself with
pkg_resources.

TBR=chrisha@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143111 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
chrisha@google.com 267d659c93 Add pylint to depot_tools.
This CL adds pylint (and its dependencies) to third_party. It plumbs them into presubmit_canned_checks, and exposes a command-line tool to access pylint.

BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143016 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org e84b7541ce Add test for git-svn with submodule/merge layout.
Review URL: https://chromiumcodereview.appspot.com/10543151

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@142479 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ferringb@google.com 79245bf553 Upgrade repo script to v1.17.
This is backwards compatible, and should be done prior
to upgrading repo's internals to 1.9.4.

BUG=chromium-os:31841
TEST=manual validation

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@142238 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 9bb85e2d87 Add support for new repo topology, with submodule-specific merge commits
on origin/master.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@141958 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org 5cf7022b80 Turn on git diff copy detection for git-cl upload.
Enable copy detection for git-cl upload.  This makes
it possible to copy a directory containing many files,
add+commit the new path, and then upload a patch to
Rietveld that shows the files were copied.

In my tests, -C -C was needed to pick up a basic
file copy.  -C was not enough.  I'm not sure why
exactly.  The output generated in the diff looks
like:

  sh$ git diff -C -C HEAD~1..HEAD
  diff --git a/slave/Makefile b/slave2/Makefile
  similarity index 100%
  copy from slave/Makefile
  copy to slave2/Makefile
  ...

(This change requires r141676 /
https://chromiumcodereview.appspot.com/10543116/ which
updates upload.py to use --find-copies-harder.)

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@141689 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org f029dcf461 Update upload.py to chromium@53dd8c978c1b
TBR=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@141676 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 9977a2e0f8 Add git cl comments to read rietveld comments without having to use the rietveld UI
R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140865 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org db9b0e3a04 Revert "Turn on git diff copy detection for git-cl upload."
This reverts commit db5a0def78.

TBR=maruel@chromium.org


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140808 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org d4af662bd6 Automatically update submodule config entries on sync.
The effect of this is to preserve the behavior of `git status`,
i.e., only changes in the top-level repository will be reported.

Updated test expectations; I have no idea what I'm doing.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140396 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org db5a0def78 Turn on git diff copy detection for git-cl upload.
Enable copy detection for git-cl upload.  This makes
it possible to copy a directory containing many files,
add+commit the new path, and then upload a patch to
Rietveld that shows the files were copied.

In my tests, -C -C was needed to pick up a basic
file copy.  -C was not enough.  I'm not sure why
exactly.  The output generated in the diff looks
like:

  sh$ git diff -C -C HEAD~1..HEAD
  diff --git a/slave/Makefile b/slave2/Makefile
  similarity index 100%
  copy from slave/Makefile
  copy to slave2/Makefile
  ...

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140314 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org f8c95cd868 Add 'android' to possible deps_os values.
Review URL: https://chromiumcodereview.appspot.com/10479004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140114 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 373af80c9e Revert r138874 "Automatically adds quotes on Windows when necessary"
This breaks _some_ msysgit uses cases. I'll investigate later.

TBR=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@139114 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ukai@chromium.org 9165550283 Fix git_cl_test.py on Windows
R=maruel@chromium.org
BUG=none
TEST=python.exe git_cl_test.py

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138964 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ea2c99ae54 Rename git-utils to git_utils so it can be imported with python.
While this is not yet necessary, it could be soon and I prefer to do this before
too many people uses it since it breaks everyone.

R=cmp@chromium.org,groby@chromium.org
BUG=
TEST=


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

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