Commit Graph

364 Commits (6f6a801ef920812e7cdc38c40ad31c6143a8d7dd)
 

Author SHA1 Message Date
maruel@chromium.org 6f6a801ef9 Prints errors on http protocol
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35156 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org c308a74419 Fix a typo in scm.GIT.GetBranch() and add --dry_run to trychange.py to ease testing.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35155 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a93717670e Add full_move flag to GIT.GenerateDiff and Factor out FindGclientRootDir into gclient_utils.
BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35154 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 650bb1f97d Small cleanups in trychange.py
Review URL: http://codereview.chromium.org/509020

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35145 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org b24a8e1a5a Remove more logic out of trychange.py into scm.py.
The goal is to (almost) completely remove git-try.

TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35144 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1227c7dedc Simplify call site.
Do a review comment I forgot to apply in a previous change.

TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35124 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org f2f9d554d4 Move GenerateDiff into a common function.
Fix standalone trychange usage on both svn and git.
Remove implicit dependency on git-cl.

TEST=unit test

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35121 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ea8c1a9bc9 Make breakpad, gcl and presubmit_support dependencies optional
TEST=unit tests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35072 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1811135923 Remove gclient-specific hacks from trychange into gcl.
Remove upload dependency.

This is towards making trychange.py work mostly standalone for the webkit try server.

TEST=unit tests and tested both gcl try and git-try.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35071 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 94b1ee9dbd Factor out gcl.GetRepositoryRoot() into scm.SVN.GetCheckoutRoot()
This is to reduce trychange.py dependency on gcl.py

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35055 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 9a2f37eaf1 Remove trychange.RunCommand and replace it by gclient_utils.CheckCall.
TEST=unit tests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35052 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org 461843e2fc Fix the author search for branches (only an issue on reverts), looking at trunk w/ the revision won't tell you
the correct author.
Review URL: http://codereview.chromium.org/505053

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35009 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 2185f0069a One liner fix.
Review URL: http://codereview.chromium.org/502075

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34984 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 0fca4f3746 Get rid of gcl.ReadFile.
Review URL: http://codereview.chromium.org/501106

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34950 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org fc83c11b37 Remove gcl.WriteFile
Review URL: http://codereview.chromium.org/502066

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34949 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org f5a1163b83 Fix a character encoding issue
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34897 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org ee98c9fddb Add eol ignore logic to make webkit merges less problematic.
Review URL: http://codereview.chromium.org/505042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34895 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org 004d2efeba Add a minimum SVN version check to drover, to enforce the 1.5.x requirement.
Review URL: http://codereview.chromium.org/501081

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34894 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org c532e17e1b gclient: implement a less hacky relative URL implementation
Doing something like basename when concatenating base_url with
relative url.

Added use_relative_urls2 to enable switching between old
implementation and new implementation. Once the old implementation
is deprecated we can remove the use_relative_urls2.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34563 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
jrg@chromium.org 4c3171835b --replace-all so we don't accum variables
Review URL: http://codereview.chromium.org/504002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34500 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 5bde485307 gclient: Add better error reporting and handling when there is a rebase conflict
When a rebase generates a conflict, report an error and exit immediately.
If in an existing conflict (no branch), report an error and exit immediately.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34459 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org e8dd16c701 gclient: Fix unittests
Review URL: http://codereview.chromium.org/486045

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34415 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org ba9b239c41 gclient: Don't change directories when checking git version.
Review URL: http://codereview.chromium.org/495003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34392 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 83376f2f5a gclient: fix git version check to handle 1.6.5.2.5.g7c3ba.dirty
Review URL: http://codereview.chromium.org/486036

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34386 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 923a0373c8 gclient: Add a minimum git version check.
Review URL: http://codereview.chromium.org/490021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34377 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ffe96f07a9 Fix default cwd value and the timing of the result code check
Review URL: http://codereview.chromium.org/474002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34166 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 82f2c08a5b Add breakpad support to git-try and trychange.py
Review URL: http://codereview.chromium.org/465128

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34087 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 63ebf04df5 Fix the way the temporary directory is created.
It is much cleaner and works for cases where the directory is not writeable.

Also fix an unrelated unit test.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34080 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
chase@chromium.org 745435c320 Fix git 1.6.1 vs 1.6.5 underscore key issue. (Hooks side.)
BUG=none
TEST=git cl upload sets watchlist extracc on rietveld
issues
Review URL: http://codereview.chromium.org/460125

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34078 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
jrg@chromium.org 3db8719858 http://codereview.chromium.org/460038
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33716 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 7aca9e8cb5 Add a check so non-google employee don't send crash dumps.
Add a warning message in case the check ever fail.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33700 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 5b3d69d2c9 Disable braekpad automatic registration while we figure out stuff
Review URL: http://codereview.chromium.org/462022

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33686 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
mnaganov@chromium.org 34e0a35edd depot_tools: Print line numbers in search results of git-gs
BUG=none
TEST=none

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



git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33683 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ada4c65e1c Minimalist breakpad implementation.
Client-side implementation.

TODO: Need to automatically disable it for unit tests.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33681 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
dpranke@google.com fa44e4aef2 Revert changes to GetCachedFile() in r30414, r30910, r31586, and go back to
the behavior before I started messing with it. It turns out it's not worth the
hassle to try and "clean this up"; we depend on the current convoluted
semantics, which is to crawl up the tree from the current dir looking for
codereview.settings files, but to only ever look for PRESUBMIT.py in the
root of the repo. Trying to unify the logic seems to be too painful.

   BUG=none
   R=maruel@chromium.org
   TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33648 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 4a47fc71a5 Add svnversion.bat.
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
15 years ago
estade@chromium.org 3b5cba4b9f Update gclient sync docs to reflect reality + add an example for the most common usage.
Review URL: http://codereview.chromium.org/456008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33390 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org f237063dce gclient: handle case for upstream has rebased
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
15 years ago
maruel@chromium.org 3884d76996 Fix gcl that was broken in revision 32611 because a change in upload.py
Review URL: http://codereview.chromium.org/436036

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@33005 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
chase@chromium.org 37c629a3b1 Call git diff --name-status with a relative path.
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
15 years ago
maruel@chromium.org cf69b45920 Fix using depot_tools from a git checkout on Windows.
Review URL: http://codereview.chromium.org/437042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32969 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org b71b67e2aa Add an automatic retry on some svn commands.
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
15 years ago
chase@chromium.org ea452b3f54 Avoid losing CL description during Rietveld outage.
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
15 years ago
maruel@chromium.org 720d9f3c22 Fix path on Windows.
TBR=nsylvain

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32748 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org c78f246ee4 Add scm.*.GetEmail() to retrieve the user email. Use this email for try job emails.
TEST=not much
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32720 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org c4e7bb311e On prompts don't add a new line when printing.
Review URL: http://codereview.chromium.org/414060

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32713 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1a6e63fff6 Small cleanup
Review URL: http://codereview.chromium.org/423002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32637 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 77ba172b82 Implement a workaround for the remaining HOSTED accounts.
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
16 years ago
maruel@chromium.org b563dd39e6 Update upload.py to revision 488 and remove HOSTED support.
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
16 years ago
msb@chromium.org b9f2f6236b gclient: fix bug in parsing ssh urls
Review URL: http://codereview.chromium.org/402105

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