Commit Graph

305 Commits (926ae6a75ffe5a613477970f2782ccabd4bcb4e0)
 

Author SHA1 Message Date
maruel@chromium.org 926ae6a75f Fix 2 recently introduced errors.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32058 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 85a3192f9c Group SCM-specific functions in classes to simplify generalization of the interface.
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
16 years ago
chase@chromium.org 53bcf15733 Make gcl change in a read-only checkout a warning.
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
16 years ago
msb@chromium.org d5a035eb15 TBR: maruel@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31916 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org ac915bb6af gclient: fix another bug where ssh urls weren't parsed correctly
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
16 years ago
maruel@chromium.org d5800f1996 Split scm-specific functions out of gclient_scm.py to scm.py.
Reapplies r31809 is typo fixed.

TEST=unit tests fixed and reclassified
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31812 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 0563d6c747 Revert "Split scm-specific functions out of gclient_scm.py to scm.py."
This reverts commit 7489404c56dcc725c7c13214f410b2d375a6630a.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31810 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 8ce0a13a85 Split scm-specific functions out of gclient_scm.py to scm.py.
TEST=unit tests fixed and reclassified
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31809 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 2dfc8ee713 Fix unit tests on Windows.
Removed lines in the process.

TEST=unit tests
BUG=none
Review URL: http://codereview.chromium.org/387033

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31759 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 8ef5f54e4d Cleanup the unit tests by mocking more system functions.
TEST=unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31754 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 57ec90d46d Cleanup the test and fix mocks. Workaround pprint flakiness.
TEST=unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31593 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org ebbf947334 Fix PyDoc.
Review URL: http://codereview.chromium.org/387005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31592 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org e3608dfc1a Run pychecker over most scripts in depot_tools. Catched a few bugs.
TEST=unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31590 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com 83e9943db5 Fix GetCachedFile(use_root=True)
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
16 years ago
maruel@chromium.org a31d6586f9 Make 'gcl change --force' generate random changename in read-only checkout.
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
16 years ago
maruel@chromium.org f40fbb3bfb Make 'gcl diff emptychange' show nothing if given change, |emptychange|, doesn't contain files.
BUG=27243
TEST=Create change which contains no files and confirm 'gcl diff createdchange' doesn't output anything.

M      gcl.py

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31551 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
chase@chromium.org 73171904f5 Fix alignment.
BUG=none
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31454 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
chase@chromium.org d36b3ed726 Error when creating a CL in a read-only checkout.
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
16 years ago
msb@chromium.org 7780c28b92 gclient: fix bug where ssh urls with a username weren't parse correctly
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
16 years ago
finnur@chromium.org e1555a609d Use TRYBOT_RESULTS_EMAIL_ADDRESS environment variable
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
16 years ago
msb@chromium.org b1a22bfe7a gclient: make sync more verbose on git
Requirement for build system.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@31362 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org 0f282063d9 gclient: Make revinfo work on git.
* 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
16 years ago
dpranke@google.com 5cc6c57bf5 Fix output reordering when you get a conflict on an update.
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
16 years ago
dpranke@google.com cef0db9d8c Fix gcl to look for newly-added codereview.settings files as well as modified
codereview.settings files.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30910 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
chase@chromium.org b2ab069ff2 Use public SVN URL for drover.
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
16 years ago
joi@chromium.org 467f4b78f1 Add missing 's' to options.
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
16 years ago
nsylvain@chromium.org 363b4d437a Make sure drover works when depot_tools is not in the path.
Review URL: http://codereview.chromium.org/341013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30865 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org c9f06b00f6 Small fixes.
Enforce --bot when --url is used.
Add a warning when --email is not defined.
Set a default --name on rietveld patches.
Set return value.

TEST=not much
BUG=when using --url and not --bot, an exception was thrown

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30848 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org e8e60e5810 gclient: make git path more verbose
Review URL: http://codereview.chromium.org/353001

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30752 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com e72bb63e3e Revise change in r30415 to properly climb local directories looking for a
modified codereview.settings or presubmit file.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30503 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com bb816387a8 Modify gcl lint to use regexes to figure out which files should be linted.
I've added two settings to codereview.settings - LINT_REGEX and 
LINT_IGNORE_REGEX - to specify which files should be linted. The default
is to lint anything that ends in .cpp, .cc, .inl, or .h, and to ignore 
nothing.

I have also modified GetCachedFile() to look for a locally modified version 
of codereview.settings before looking in the repository.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30415 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org 260c65333a Add directory check to Git revert.
Review URL: http://codereview.chromium.org/339037

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30317 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com 9e890f92e9 Move the log message up a line to make sure it appears before the actual
output.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30307 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com 22e29d4ec5 Make 'gclient update' and 'gclient status' quieter by default - they don't
print messages unless the underlying commands actually generate output.
This is a more conservative version of r28271.

  BUG=none
  TEST=none
  R=maruel

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30296 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
nsylvain@chromium.org b5fdbaad26 Make drover works in cygwin.
Review URL: http://codereview.chromium.org/342008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@30285 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
nsylvain@chromium.org 5ebf1639ab Change the default workdir for drover.
Review URL: http://codereview.chromium.org/330008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29965 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
nsylvain@chromium.org 864fbdd5c6 Add a new --workdir param to specify the subdir to use
to do the revert.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29936 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
pkasting@chromium.org 4e9f491f8d Try to clarify "gcl help try" some.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/332014

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29927 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
laforge@chromium.org 94ed5021d8 Add --ignore-history to merge command (only applicable to branch merges).
Review URL: http://codereview.chromium.org/292052

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29699 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 0645c60336 Fix exit 1 to goto :EOF.
Remove stale reference to bootstrap\update.bat.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/307004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29637 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
chase@chromium.org e8c918dfd9 Make svn password prompt available during setup.
Allow the user to interact with the svn password prompt
if needed.  Verify the svn server is reachable before
proceeding.  Clean extra UI issues up.  Readability
fixes.

BUG=none
TEST=prompted for a svn password if ~/.subversion/auth
is empty, bad svn server causes early timeout
Review URL: http://codereview.chromium.org/267059

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29552 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
nsylvain@chromium.org 9ce9822389 gcl: Make fix the override_description code and add a silent flag.
drover: switch to use optparse, and add the arguments to be able to support
the revert bot.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29446 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org e959791851 Add pymox, fixed non-deterministic pprint.pformat output expectation.
pymox auto-checkout never really worked well so check-in pymox directly.

pprint.pformat is non-determinist in one test. Worked around the issue.

TEST=unit tests
BUG=none
Review URL: http://codereview.chromium.org/266043

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29398 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
nsylvain@chromium.org a489904204 Make drover look a little bit more like the rest of
the python code we have. 90% of the changes are removing
trailing spaces.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29312 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
shess@chromium.org 5ab676cf91 Don't iterate options.bot if it isn't present.
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29220 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
nsylvain@chromium.org b97010c918 Update drover to the latest version (from laforge)
Review URL: http://codereview.chromium.org/274072

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29214 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
chase@chromium.org 94ba024845 Fixes based on maruel's comments.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/281007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29194 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
mattm@chromium.org 6f3c2c673f Allow specifying multiple bots with git-try.
BUG=none
TEST=git-try -b linux -b linux_view

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29171 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
chase@chromium.org f3c9280850 Fail gracefully when we can't import hooks library.
BUG=5339
TEST=excluding depot_tools from PATH shows an
instructive error, trying to run the hook with
git_cl_hooks.py missing shows an instructive error
Review URL: http://codereview.chromium.org/264069

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@29156 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
thestig@chromium.org cce9e1c2fa Check Exception object's argument length in trychange.py.
Review URL: http://codereview.chromium.org/274031

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