- 15 Jun, 2010 2 commits
-
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2807003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49789 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
The novel addition here is to not convert a checkout into an update when no files were checked out. Also delete the directory to increase the chances of success. TEST=wait for google code to fail again BUG=32783 Review URL: http://codereview.chromium.org/2858003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49788 0039d316-1c4b-4281-b951-d872f2087c98
-
- 14 Jun, 2010 1 commit
-
-
maruel@chromium.org authored
The change is partial to keep this change still correct but readable/reviewable. Followup changes will further move functions into the Dependency class. If it was done in one change, it would be unreviewable. Fix GetScmName() for protocol svn+ssh://. TEST=didn't break the smoke tests. Review URL: http://codereview.chromium.org/2837001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49707 0039d316-1c4b-4281-b951-d872f2087c98
-
- 11 Jun, 2010 5 commits
-
-
maruel@chromium.org authored
Another step in my quest to make the refactor reviewable. Review URL: http://codereview.chromium.org/2786014 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49601 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
TBR=bradnelson Review URL: http://codereview.chromium.org/2749018 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49582 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Fix gclient diff & pack to not throw uncatched exceptions when a directory is missing. Reorder things in gclient.py for easier diff later Update revinfo help Add GetScmName(), it will be needed later. TEST=unit tests BUG=none Review URL: http://codereview.chromium.org/2786013 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49565 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2776006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49554 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Switch "" usage to '' to please Brad. Didn't change gclient.py yet because it will conflict with the refactor. TEST=unit tests still pass. Review URL: http://codereview.chromium.org/2769011 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49545 0039d316-1c4b-4281-b951-d872f2087c98
-
- 10 Jun, 2010 1 commit
-
-
maruel@chromium.org authored
The recursive DEPS is to be used with From() testing. Didn't enable From() yet since it broke tests and to simplify this change. Review URL: http://codereview.chromium.org/2699005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49427 0039d316-1c4b-4281-b951-d872f2087c98
-
- 07 Jun, 2010 2 commits
-
-
cbentzel@chromium.org authored
Review URL: http://codereview.chromium.org/2654004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49050 0039d316-1c4b-4281-b951-d872f2087c98
-
cbentzel@chromium.org authored
Review URL: http://codereview.chromium.org/2627010 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@49049 0039d316-1c4b-4281-b951-d872f2087c98
-
- 04 Jun, 2010 7 commits
-
-
maruel@chromium.org authored
TBR=bradnelson Review URL: http://codereview.chromium.org/2671003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48961 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Fix a bug in scm.SVN.DiffItem() Reduce variable aliasing, fix alignments, etc. Review URL: http://codereview.chromium.org/2673002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48943 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Add a lot of checking for stdout and fix one mis-assumption. Make the code much more compact. Make the git_hashes 'revisions' 1-based for consistency. Review URL: http://codereview.chromium.org/2594001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48925 0039d316-1c4b-4281-b951-d872f2087c98
-
tony@chromium.org authored
switching repositories. This could result in clobbering changes you may have in a third_party checkout, but if you pass --force, I think you're asking for this behavior. Review URL: http://codereview.chromium.org/2645001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48902 0039d316-1c4b-4281-b951-d872f2087c98
-
tony@chromium.org authored
Turns out that this was added in svn 1.5 and the mac bots use svn 1.4.4. Review URL: http://codereview.chromium.org/2623002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48899 0039d316-1c4b-4281-b951-d872f2087c98
-
tony@chromium.org authored
TBR=maruel git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48898 0039d316-1c4b-4281-b951-d872f2087c98
-
tony@chromium.org authored
command line to gclient, pass the flag to svn update and svn co too. This allows updates when we have dirty files left around. For example, an update may remove a directory, but the directory still has .vcproj or .mk files in it. If we try to re-add that directory, svn will error out. If we add --force, it'll happily allow the update. Review URL: http://codereview.chromium.org/2560001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48897 0039d316-1c4b-4281-b951-d872f2087c98
-
- 03 Jun, 2010 1 commit
-
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2545001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48793 0039d316-1c4b-4281-b951-d872f2087c98
-
- 02 Jun, 2010 5 commits
-
-
viettrungluu@chromium.org authored
BUG=none TEST=drover still works as before, but hyphens are no longer eliminated from commit messages Review URL: http://codereview.chromium.org/2488004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48771 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
TBR=nsylvain Review URL: http://codereview.chromium.org/2475004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48755 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2455008 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48738 0039d316-1c4b-4281-b951-d872f2087c98
-
msb@chromium.org authored
I found including a git repo in my DEPS file to be unreliable, esp since I pinning to a specific commit. Whenever I changed the commit in the DEPS file, gclient would attempt to do a rebase and this was failing due to how rebase was being invoked. While investigating the problem, I decided it might be better to take a different approach. Namely, when cloning gclient should just checkout the working tree to a detached HEAD. In this way, gclient can more easily determine if the user has made any changes in the cloned repo. Future updates (as long as there are no changes) become a much simpler operation w/no need to invoke rebase. This is a series of five commits, but sadly, git cl will squash them into this single review. Here are the original commit messages: commit 8cd2213f006a6f4b3f6b8c448a1362b9410d47f1 Author: Jay Soffian <jaysoffian@gmail.com> Date: Wed Apr 14 18:29:18 2010 -0400 Use rev-parse to determine current branch Git branch is a so-called porcelain and its output cannot be relied upon; use git rev-parse instead. gclient_scm.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) commit 1a09e04554acfa2671f9588ee9eef0bdbe677ed2 Author: Jay Soffian <jaysoffian@gmail.com> Date: Wed Apr 14 22:16:53 2010 -0400 Detached HEAD does not always imply rebasing; use an _IsRebasing() function instead. gclient_scm.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) commit 45308a58c3f1e30b760f13abe3a6288267265fa8 Author: Jay Soffian <jaysoffian@gmail.com> Date: Wed Apr 14 22:19:10 2010 -0400 Clarify comments to use common git terminology gclient_scm.py | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit 5e5a661b7dd9c83b2c9c35950f3267d15b7e840a Author: Jay Soffian <jaysoffian@gmail.com> Date: Tue May 4 12:15:40 2010 -0400 Make CaptureStatus use GetUpstreamBranch() instead of assuming 'origin' scm.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 42a8bfebd2e1b1be01025c1324d75920ac6eb0e1 Author: Jay Soffian <jaysoffian@gmail.com> Date: Wed Apr 14 22:19:29 2010 -0400 Use a detached HEAD when checking out a tag or commit After cloning, if a tag or commit was specified, leave a detached HEAD. This way we can reliably detect if the user changed the working tree (since HEAD would no longer be detached). Further, this simplifies the code path when the dependency is updated to a new tag/commit. As long as HEAD is detached when we update, we simply checkout whatever we fetched w/o needing to worry about rebasing. gclient_scm.py | 126 +++++++++++++++++++++++++++++++------------- tests/gclient_scm_test.py | 6 +-- 2 files changed, 91 insertions(+), 41 deletions(-) Review URL: http://codereview.chromium.org/1652007 Patch from Jay Soffian <jaysoffian@gmail.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48722 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2487003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48688 0039d316-1c4b-4281-b951-d872f2087c98
-
- 01 Jun, 2010 3 commits
-
-
nsylvain@google.com authored
relative path. bug:45589 Review URL: http://codereview.chromium.org/2447002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48680 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2425003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48637 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
BUG=23328 Review URL: http://codereview.chromium.org/2446001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48613 0039d316-1c4b-4281-b951-d872f2087c98
-
- 31 May, 2010 4 commits
-
-
maruel@chromium.org authored
TBR=bradnelson Review URL: http://codereview.chromium.org/2444001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48610 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Make -r invalid@rev a warning and ignore the argument. Make -r rev use the Nth solution. Fix a bug in FakeRepos.assertTree(). TEST=updated the smoke test to reflect the new behavior which should be the most compatible with the current buildbot behavior BUG=chromium-os:3465 Review URL: http://codereview.chromium.org/2430001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48607 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2408001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48606 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2336002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48582 0039d316-1c4b-4281-b951-d872f2087c98
-
- 28 May, 2010 8 commits
-
-
maruel@chromium.org authored
Otherwise, commands like "gcl commit" would throw an exception instead of a comprehensible error message. TBR=jam Review URL: http://codereview.chromium.org/2366002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48520 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
TBR=nasser Review URL: http://codereview.chromium.org/2338002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48512 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Review URL: http://codereview.chromium.org/2384001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48508 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Make it work with 'coverage'. Make FakeRepos initialization lazy. Only generate the repository when needed. It's in part intended for gclient_scm_tests.py but I left it out of this review. To use: easy_install coverage ./tests/gclient_smoke.py -c coverage report Current coverage with gclient_smoke: Name Stmts Exec Cover ----------------------------------------------- gclient 557 416 74% gclient_scm 496 270 54% gclient_utils 195 117 60% scm 439 180 41% (ignoring irrelevant files) It's quite good in fact, 74% of gclient.py being executed with the smoke test. Review URL: http://codereview.chromium.org/2352002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48501 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
TEST=new smoke test BUG=chromiums-os:3465 Review URL: http://codereview.chromium.org/2304002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48490 0039d316-1c4b-4281-b951-d872f2087c98
-
nasser@codeaurora.org authored
Review URL: http://codereview.chromium.org/2380001 Change-Id: Icfef43fe507be04b8c178440834d26b9ac3ced77 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48489 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
BUG=chromium-os:2308 Review URL: http://codereview.chromium.org/2337003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48488 0039d316-1c4b-4281-b951-d872f2087c98
-
maruel@chromium.org authored
Add an explicit Register() function to be called outside of this file. Send the host fqdn to help know from where the exception comes. It is useful when a build slave throws an exception. Review URL: http://codereview.chromium.org/2327003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48455 0039d316-1c4b-4281-b951-d872f2087c98
-
- 27 May, 2010 1 commit
-
-
maruel@chromium.org authored
TBR=jam Review URL: http://codereview.chromium.org/2342001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48449 0039d316-1c4b-4281-b951-d872f2087c98
-