It is necessary for webkit build slaves.
Review URL: http://codereview.chromium.org/460023
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33601 0039d316-1c4b-4281-b951-d872f2087c98
gclient sync will potentially fail if the upstream git tree has been rebased.
This CL fixes this by using rebase --onto to only rebase our local changes.
Review URL: http://codereview.chromium.org/432017
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33011 0039d316-1c4b-4281-b951-d872f2087c98
On a new Linux box, during git cl dcommit I observed
the error:
fatal: invalid diff option/value: -r
This was caused by the git cl presubmit hooks running:
git diff --name-status -r refs/remotes/origin/trunk.. /path/to/src
By passing a relative path (given by git rev-parse
--show-cdup) instead of an absolute path for
/path/to/src, git diff --name-status does not print an
error and returns the expected list of changed files.
Also fix some broken scm and gclient_scm unit tests.
BUG=none
TEST=git presubmit hooks work from main working
directory
Review URL: http://codereview.chromium.org/438012
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32999 0039d316-1c4b-4281-b951-d872f2087c98
Subversion's client just bails out too early too often.
Review URL: http://codereview.chromium.org/437015
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32967 0039d316-1c4b-4281-b951-d872f2087c98
Save the CL locally prior to attempting to submit
to Rietveld. The CL is saved locally with a dirty-bit
before the upload is attempted. If successful, the CL
is saved locally again with a clean-bit.
On loading a dirty CL for editing, we only load the
CL description from Rietveld if the local CL is clean
(there are no pending changes to upload). Clean CLs
continue to retrieve updated descriptions directly
from Rietveld.
BUG=none
TEST=gcl change <name> saves CL description local
prior to uploading. gcl change <name> after a failed
Rietveld upload uses local CL description instead of
using the associated issue's description from Rietveld.
Changes in this state are reset to the 'clean' state
after the Rietveld update completes.
Review URL: http://codereview.chromium.org/428001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32791 0039d316-1c4b-4281-b951-d872f2087c98
TEST=upload always work whatever the case
BUG=none
Review URL: http://codereview.chromium.org/418010
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32617 0039d316-1c4b-4281-b951-d872f2087c98
TEST=not tested at all.
Review URL: http://codereview.chromium.org/414035
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32611 0039d316-1c4b-4281-b951-d872f2087c98
add this to PRESUBMIT.py in the chromium tree later).
- Update cpplint.py to the latest version from the style guide.
Review URL: http://codereview.chromium.org/395022
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32180 0039d316-1c4b-4281-b951-d872f2087c98
TEST=none
BUG=none
Move scm functions into a class to make it simpler to manage.
Review URL: http://codereview.chromium.org/391052
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32057 0039d316-1c4b-4281-b951-d872f2087c98
BUG=25824
TEST=gcl change in a read-only checkout is now a warning
instead of a hard error
Review URL: http://codereview.chromium.org/384128
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31942 0039d316-1c4b-4281-b951-d872f2087c98
ssh://test@example.com wasn't being parsed correctly for revinfo.
Fixed by factoring out all code which splits url into a base_url
and revision.
Review URL: http://codereview.chromium.org/391048
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31910 0039d316-1c4b-4281-b951-d872f2087c98
Fix GetCachedFile() to skip local mods when use_root is True. The files
that exist in the root of the tree don't even seem to exist in the normal
source checkouts, and we were looking at a different file as a result.
BUG=none
R=maruel@chromium.org
TEST=locally modify a PRESUBMIT.py file and look for duplicate results.
If you get duplicates, this didn't fix it
Review URL: http://codereview.chromium.org/379021
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31586 0039d316-1c4b-4281-b951-d872f2087c98
BUG=27241
TEST=running 'gcl change --force' in a read-only checkout creates random changename.
M gcl.py
Review URL: http://codereview.chromium.org/387001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31552 0039d316-1c4b-4281-b951-d872f2087c98
BUG=25824
TEST=running 'gcl change foo' in a read-only checkout
shows an error, --force creates a CL anyway, and gcl
change in read-write checkouts continues to work.
Review URL: http://codereview.chromium.org/378027
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31452 0039d316-1c4b-4281-b951-d872f2087c98
ssh://test@example.org/test.git was not parsed correctly because we
would split at the '@' assuming what followed was a revision.
Review URL: http://codereview.chromium.org/372045
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31444 0039d316-1c4b-4281-b951-d872f2087c98
for the try servers and fallback on EMAIL_ADDRESS, since
WebKit uses that.
The reason is that some people have WebKit emails that
predate Chromium emails so some separation is warranted
so that people don't have to fix up emails all the time.
BUG=None
TEST=None
Original review: http://codereview.chromium.org/372048
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31437 0039d316-1c4b-4281-b951-d872f2087c98
* Add revinfo as part of SCMWrapper interface.
* Implement revinfo for git and svn.
* Add unit tests.
Review URL: http://codereview.chromium.org/362008
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31280 0039d316-1c4b-4281-b951-d872f2087c98
If you're not running gclient sync with --verbose and you get a conflict on
a file, the conflict message prints *before* the message that you're running
update in the appropriate directory. This is happening because we intercept
stdout but not stderr, and the conflict prompt goes to stderr. redirecting
stderr in the popen() to the pipe fixes this.
R=maruel@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/373003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31276 0039d316-1c4b-4281-b951-d872f2087c98
BUG=none
TEST=drover can access SVN server from outside Google
Review URL: http://codereview.chromium.org/340079
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30888 0039d316-1c4b-4281-b951-d872f2087c98
BUG=none
TEST='gcl try' should succeed even if EMAIL_ADDRESS env variable is not set.
Review URL: http://codereview.chromium.org/351025
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30870 0039d316-1c4b-4281-b951-d872f2087c98
maruel@chromium.org
estade@chromium.org
msb@chromium.org
chase@chromium.org
laforge@chromium.org
erg@google.com
dpranke@google.com
finnur@chromium.org
joi@chromium.org