Commit Graph

68 Commits (14ec50401cbe7e364b5636ed74ae546205bfc452)

Author SHA1 Message Date
nasser@codeaurora.org 5d63eb8382 revinfo: Properly use git HEAD or svn BASE revisions
BUG=http://crosbug.com/1658

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@42555 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
nasser@codeaurora.org de8f352ebb r41078 broke revinfo for .gclient files with multiple solutions
This commit fixes that, though the --snapshot option doesn't work perfectly.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@41351 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 55e724e8fe Stop SVNWrapper and GitWrapper from inheriting from scm.SVN and scm.GIT.
This simplifies the unit tests and clarify what is what.

Ran pychecker on a few files.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@41310 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org e3da35f6ca Add a --snapshot option for revinfo. If set, revinfo prints a .gclient file
set to sync to the current revisions/hashes on disk

Add a --gclientfile=FILENAME option.  If set, gclient loads FILENAME
rather than .gclient for configuration info.

Patch contributed by jneddo@nvidia.com

BUG=1658
TEST=Verify that --snapshot prints a valid configuration file
     Verify that when --gclientfile is set the correct file is used
     Verify that gclient sync --gclientfile sets the correct revisions

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@41078 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
nasser@codeaurora.org 952d7c74f4 Fix revinfo with git
BUG=37104
BUG=chromium-os:1658

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@40294 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
davemoore@chromium.org 793796dcc6 Add gcl-reset option.
Review URL: http://codereview.chromium.org/647063

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@39457 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
nasser@codeaurora.org 1f7a3d1d6d Add progress indicator for sync
Review URL: http://codereview.chromium.org/564051

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@38104 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ba55177642 Fix licensing headers and move most third party code to third_party/
Moved tests/pymox to third_party/pymox
Moved upload.py to third_party/upload.py
Fixed tests so they can run standalone
Fixed the executable bit on some scripts

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37987 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org d6504218f2 Update docs for git usage
chromium-os BUG=1189

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36129 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org e6f78352a7 gclient: git relative url implementation
Redo relative url implementation per maruel's comments here:
http://codereview.chromium.org/500015

Instead of adding an option, implement relative urls differently for
git urls.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36126 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a6220d1b7b Reduce log level to sanity.
TEST=use -v -v
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35648 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
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
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
maruel@chromium.org 5aeb7dd54c Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.
Noteworthy change is scm.SVN.GetFileProperty calls Capture instead of Run.

TEST=unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32181 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 261eeb5e93 Revert 32057, 32058, 32059, 32062 because they still have unwanted side-effects.
Revert "Group SCM-specific functions in classes to simplify generalization of the interface."
Revert "Fix 2 recently introduced errors."
Revert "Fix a variable aliasing error."
Revert "Fix typo."

TBR=dpranke
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32065 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
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 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
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 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
maruel@chromium.org 7753d24625 Revert "Un-revert the reverted 28058, so that we get quiet again."
This reverts commit 28058.

BUG=24081
TEST=gclient sync without --force is not working anymore.
TBR=dpranke

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@28271 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com 2a6e20ca4a Un-revert the reverted 28058, so that we get quiet again.
BUG=none
  R=maruel
  TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@28185 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 9344e97ada Revert "Modify the output of gclient update, gclient status to only print out"
Its side-effect caused tree breakages, at least on the try slaves.

TBR=dpranke
BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@28058 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
dpranke@google.com 1a77f1dc15 Modify the output of gclient update, gclient status to only print out
messages when --verbose is specified or when something actually happens.

Also, remove --manually_grab_svn_rev, because we need this to happen all 
the time to get gclient update to shut up if we're comparing against HEAD.
It doesn't look like there are any real side effects of removing this.

An alternative change would be to wrap this behind a --quiet flag.

Note that the change to tests/trychange_unittest.py is an unrelated fix to get
all the tests to pass.

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

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@28039 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org 8301701a81 gclient: fix to support reading .gclient_entries in old list format
Review URL: http://codereview.chromium.org/249021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@27386 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org 2e38de7be5 gclient: don't make SVN-specific calls in RunOnDeps
Replaced a call to CaptureSVNStatus with a SCMWrapper::status

gclient: store gclient_entries as a dict

Currently we only store the relative path for entries.
We need to also store the url so that learn the repo type: git or snv.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@27370 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org 770ff9ee21 gclient: store revision as a string and not int
Currently, revision numbers are stored as int. This won't work
for git's SHA1s. So storing revisions as strings.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26940 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
yaar@chromium.org f132804ce5 GClient should allow having 'url': None in .gclient
This is for situations where the solution is checked out by another SCM
mechanism (e.g. update-webkit or just svn co) but we want to use gclient to
fetch the dependencies.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26876 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org cb5442bf76 gclient_scm: add test for unsupported scm
gclient_scm: use a map for deciding whether or not the scm is supported

gclient_scm: add a checks for unsupported scm and unimplemented method

git_scm: pull out svn code into SVNWrapper

gclient_scm: create a create_scm factory method

Use a factory method to abstract SCMWrapper creation. This method
will eventually return the correct subclass of SCMWrapper. Initially,
there will only be SVNWrapper.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26823 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 754960e99b Fix gclient revert for external, switched and conflicted directories.
TEST=gclient revert more stuff but stops reverting external directories
BUG=none

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


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26672 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 5e73b0cfa1 Revert "Use a factory method to abstract SCMWrapper creation." totally broke gclient.
TBR=msb
TEST=none
BUG=none

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


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26606 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
msb@chromium.org 56237087e9 Use a factory method to abstract SCMWrapper creation.
This method will eventually return the correct subclass of SCMWrapper. Initially, there will only be SVNWrapper.

gclient_scm: add test for unsupported scm

gclient_scm: make SCMWrapper constructor parameters non-optional

gclient_scm: add a checks for unsupported scm and unimplemented method

git_scm: pull out svn code into SVNWrapper

gclient_scm: create a create_scm factory method

TEST=
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26602 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 167b9e63c7 Fix PyChecker errors caused by r26423.
Patch contributed by msb@

TEST=unit test
BUG=none

Review url: http://codereview.chromium.org/213006


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26457 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 5f3eee3bab gclient: remove wildcard import from git_scm
Part of a larger refactoring to abstract SCM-specific bits.

presubmit_support, revert, gcl: modify to import gclient_scm and gclient_utils

Part of a larger refactoring to abstract SCM-specific bits.

revert, gcl: modify to import gclient_scm and gclient_utils

Part of a larger refactoring to abstract SCM-specific bits.

gclient: pull out SCM bits

Pulled out SCMWrapper into gcliet_scm.py as part of a larger refactoring to
abstract SCM-specific bits. Plan is to evenutally add git support.

Pulling out SCMWrapper also required pulling out utility functions into
a gclient_utility.py.

Patch contributed by msb@

TEST=none
BUG=none


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26423 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
gspencer@google.com df2d59059d This adds a feature to gclient to allow the (optional) specification of the
name of the top level "DEPS" file of a solution from within the .gclient spec.

This allows users to edit their gclient once and use a different (perhaps
experimental) DEPS file instead of the traditionally named "DEPS".

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26031 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
kbr@google.com ab318594b3 Added "gclient pack" subcommand, which generates a patch relative to
the root of the source tree. It is similar to "gclient diff", and
shares much of the implementation, but it seems that developers may
want the semantics of each in different situations, which is why it is
being added as a new command.

Generalized SubprocessCallAndCapture into SubprocessCallAndFilter.
Added RunSVNAndFilterOutput; changed RunSVNAndGetFileList to use it.
Fixed problem in presubmit_canned_checks.py where it was not working
on Windows. Updated unit tests for gclient.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@25410 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 5df6a46313 Enforce --force when running gclient runhooks
Review URL: http://codereview.chromium.org/173174


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@24761 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 57e893ef48 Improves the 'gclient revinfo' display info.
Patch contributed by thiago.farina@gmail.com

Review url: http://codereview.chromium.org/172028

BUG=None
TEST=None


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@23718 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
phajdan.jr@chromium.org d83b2b28a0 Make gclient pass correct relative paths to the hooks.
Review URL: http://codereview.chromium.org/165070

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@23026 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
phajdan.jr@chromium.org 68f2e09652 Splice matching_files_list in $matching_files' place in gclient.py.
Based on Mark Mentovai's mail.
Review URL: http://codereview.chromium.org/164068

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@22616 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org c5e9aec590 Fix output on Windows when gclient warns the user about a stale directory.
TEST=unit test
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@22290 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
phajdan.jr@chromium.org 71b4068161 Pass matching file list to the hook in gclient.
Review URL: http://codereview.chromium.org/160294

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@22224 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
evan@chromium.org 67820efbf0 Add a --nohooks to gclient to update/sync/revert without calling the hooks
BUG=16856

Patch from Fabien Tassin <fta@sofaraway.org>.


git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@21655 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
phajdan.jr@chromium.org 644aa0cfaa Add export command to gclient.py
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@20990 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org b8b6b871f5 Add help for --head.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@19622 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
ajwong@chromium.org 8399dc0549 Fix silly typo issue. Not sure how the original code worked on my box.
Review URL: http://codereview.chromium.org/146050

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@19063 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
ajwong@chromium.org cdcee80cd8 Modify gclient to only delete unversioned trees during an update if
the --delete_unversioned flag is specified.  This only affects the update
command.  Reverts will still delete the unversioned tree.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@19021 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
maruel@chromium.org 1ab7ffcce9 Fix gclient config with a trailing backslash.
Review URL: http://codereview.chromium.org/118160

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