- 17 Feb, 2015 1 commit
-
-
primiano@chromium.org authored
Reland crrev.com/743083002, which was reverted in crrev.com/796053002 due to some test flakiness, probably related with an old version of Git on the bots. Relanding now that the infra has been updated to Trusty (plus adding some de-flake precautions). Original CL Description: Make gclient ready for the Blink (DEPS to main project) transition This CL makes gclient understand correctly whether a git project is being moved from DEPS to an upper project and vice-versa. The driving use case for this is the upcoming Blink merge, where third_party/Webkit will be removed from DEPS (and .gitignore) and will become part of the main project. At present state, gclient leaves the .git folder around when a project is removed from DEPS, and that causes many problems. Furthermore this CL solves the performance problem of bisecting across the merge point. The subproject's (Blink) .git/ folder is moved to a backup location (in the main checkout root) and is restored when moving backwards, avoiding a re-fetch when bisecting across the merge point. BUG=431469 Review URL: https://codereview.chromium.org/910913003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294082 0039d316-1c4b-4281-b951-d872f2087c98
-
- 11 Dec, 2014 1 commit
-
-
primiano@chromium.org authored
Revert of Make gclient ready for the Blink (DEPS to main project) transition (patchset #6 id:180001 of https://codereview.chromium.org/743083002/) Reason for revert: The test intoruced is flake (see crrev.com/753543006/). Need to look into that with more patience as it reproduces only on precise. Original issue's description: > Make gclient ready for the Blink (DEPS to main project) transition > > This CL makes gclient understand correctly whether a git project is > being moved from DEPS to an upper project and vice-versa. > The driving use case for this is the upcoming Blink merge, where > third_party/Webkit will be removed from DEPS (and .gitignore) and will > become part of the main project. > > At present state, gclient leaves the .git folder around when a project > is removed from DEPS, and that causes many problems. > > Furthermore this CL solves the performance problem of bisecting across > the merge point. The subproject's (Blink) .git/ folder is moved to a > backup location (in the main checkout root) and is restored when moving > backwards, avoiding a re-fetch when bisecting across the merge point. > > BUG=431469 > > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=293329 TBR=iannucci@chromium.org,maruel@chromium.org,jochen@chromium.org NOTREECHECKS=true NOTRY=true BUG=431469 Review URL: https://codereview.chromium.org/796053002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293352 0039d316-1c4b-4281-b951-d872f2087c98
-
- 10 Dec, 2014 1 commit
-
-
primiano@chromium.org authored
This CL makes gclient understand correctly whether a git project is being moved from DEPS to an upper project and vice-versa. The driving use case for this is the upcoming Blink merge, where third_party/Webkit will be removed from DEPS (and .gitignore) and will become part of the main project. At present state, gclient leaves the .git folder around when a project is removed from DEPS, and that causes many problems. Furthermore this CL solves the performance problem of bisecting across the merge point. The subproject's (Blink) .git/ folder is moved to a backup location (in the main checkout root) and is restored when moving backwards, avoiding a re-fetch when bisecting across the merge point. BUG=431469 Review URL: https://codereview.chromium.org/743083002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293329 0039d316-1c4b-4281-b951-d872f2087c98
-
- 09 Sep, 2014 1 commit
-
-
mmoss@chromium.org authored
R=iannucci@chromium.org, maruel@chromium.org BUG=410959 Review URL: https://codereview.chromium.org/549733002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291883 0039d316-1c4b-4281-b951-d872f2087c98
-
- 11 Jun, 2014 2 commits
-
-
hinoka@google.com authored
Revert of scm.GIT.IsValidRevision: Only return True if the given object is a commit (https://codereview.chromium.org/329823002/) Reason for revert: Speculative revert to see if this is the cause of auto_roll_test.py to fail in build/ presubmit. Original issue's description: > scm.GIT.IsValidRevision: Only return True if the given object is a commit > > BUG=383476 > > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=276487 TBR=iannucci@chromium.org,maruel@chromium.org,borenet@google.com NOTREECHECKS=true NOTRY=true BUG=383476 Review URL: https://codereview.chromium.org/329393002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@276493 0039d316-1c4b-4281-b951-d872f2087c98
-
borenet@google.com authored
BUG=383476 Review URL: https://codereview.chromium.org/329823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@276487 0039d316-1c4b-4281-b951-d872f2087c98
-
- 23 Apr, 2014 1 commit
-
-
szager@chromium.org authored
BUG= Review URL: https://codereview.chromium.org/247493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265735 0039d316-1c4b-4281-b951-d872f2087c98
-
- 09 Apr, 2014 1 commit
-
-
borenet@google.com authored
BUG=skia:1638 Review URL: https://codereview.chromium.org/189913020 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262761 0039d316-1c4b-4281-b951-d872f2087c98
-
- 03 Apr, 2014 1 commit
-
-
nodir@chromium.org authored
Bug=359292 Original commit: b1391c6a Revert: 8e5f7d308fde74c52e321587649c16568e4a9644 Original commit comment: > Now trychange can store patches in a Git repo > A git patch repo is cloned to .git/git-try/patches-git, if was not > cloned before. Otherwise, changes are pulled. Then a patch is committed a > pushed. > --revision=auto (Git only) is resolved to the revision the diff is genera > against. git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261247 0039d316-1c4b-4281-b951-d872f2087c98
-
- 02 Apr, 2014 1 commit
-
-
nodir@chromium.org authored
This reverts commit b1391c6a. git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261220 0039d316-1c4b-4281-b951-d872f2087c98
-
- 30 Mar, 2014 1 commit
-
-
nodir@chromium.org authored
A git patch repo is cloned to .git/git-try/patches-git, if was not cloned before. Otherwise, changes are pulled. Then a patch is committed and pushed. --revision=auto (Git only) is resolved to the revision the diff is generated against. R=stip@chromium.org, agable@chromium.org, iannucci@chromium.org, maruel@chromium.org BUG=325882 Review URL: https://codereview.chromium.org/184343003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260471 0039d316-1c4b-4281-b951-d872f2087c98
-
- 10 Mar, 2014 2 commits
-
-
thakis@chromium.org authored
Revert of Another attempt: gclient: delete mismatching checkouts (https://codereview.chromium.org/183283003/) Reason for revert: Broke `gclient sync` for me, failing with: Error: 1> Can't update/checkout /Volumes/MacintoshHD2/src/chrome-git/src if an unversioned directory is present. Delete the directory and try again. For someone else, it broke it with: % gclient sync ________ unmanaged solution; skipping src Error: Command svn info --xml returned non-zero exit status 1 in /Users/pawliger/chromium/src/. <?xml version="1.0" encoding="UTF-8"?> <info> svn: E155007: '/Users/pawliger/chromium/src' is not a working copy Original issue's description: > Another attempt: gclient: delete mismatching checkouts > > Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=255930 TBR=iannucci@chromium.org,szager@chromium.org,maruel@chromium.org,mmoss@chromium.org,borenet@google.com NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/192323006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256005 0039d316-1c4b-4281-b951-d872f2087c98
-
borenet@google.com authored
Review URL: https://codereview.chromium.org/183283003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255930 0039d316-1c4b-4281-b951-d872f2087c98
-
- 26 Feb, 2014 2 commits
-
-
szager@chromium.org authored
This reverts commit 6ff54485. 'fetch --nohooks chromium' is broken with this change. BUG= Review URL: https://codereview.chromium.org/177003023 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253640 0039d316-1c4b-4281-b951-d872f2087c98
-
borenet@google.com authored
Review URL: https://codereview.chromium.org/164053003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@253616 0039d316-1c4b-4281-b951-d872f2087c98
-
- 13 Feb, 2014 1 commit
-
-
mmoss@chromium.org authored
> Re-reland r245404 ("If the destination directory doesn't contain the desired repo, delete it") > > BUG= > > Review URL: https://codereview.chromium.org/133073015 TBR=borenet@google.com Review URL: https://codereview.chromium.org/146583013 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250878 0039d316-1c4b-4281-b951-d872f2087c98
-
- 11 Feb, 2014 1 commit
-
-
borenet@google.com authored
BUG= Review URL: https://codereview.chromium.org/133073015 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@250482 0039d316-1c4b-4281-b951-d872f2087c98
-
- 12 Jul, 2013 1 commit
-
-
ilevy@chromium.org authored
BUG=259434 R=iannucci Review URL: https://chromiumcodereview.appspot.com/18408006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211483 0039d316-1c4b-4281-b951-d872f2087c98
-
- 09 Jul, 2013 1 commit
-
-
bratell@opera.com authored
--no-pager looks ugly in logs and output and makes commands harder to read. Setting an environment variable is better. This is a followup to https://chromiumcodereview.appspot.com/14104005/ which added --no-pager. Review URL: https://chromiumcodereview.appspot.com/18173003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210503 0039d316-1c4b-4281-b951-d872f2087c98
-
- 08 Jul, 2013 1 commit
-
-
ilevy@chromium.org authored
Fix identification of shas that contain capitalized hexadecimal characters. Addresses comments from http://crrev.com/18262002/ R=maruel@chromium.org Review URL: https://chromiumcodereview.appspot.com/18292005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210429 0039d316-1c4b-4281-b951-d872f2087c98
-
- 03 Jul, 2013 2 commits
-
-
iannucci@chromium.org authored
This enables significant time savings, especially since file_list only exists to enable file-specific hooks (which, AFAIK, nothing actually uses). On a z620 (linux) using the cached git repos, a first-time `gclient sync --nohooks` takes: * (with) 131.06s user 14.10s system 117% cpu 2:03.89 total * (without) 482.13s user 189.35s system 144% cpu 7:45.63 total This change makes nohooks cause file_list to be None if we don't need to accumulate it, and updates GitWrapper and SvnWrapper appropriately. R=szager@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/18541006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210026 0039d316-1c4b-4281-b951-d872f2087c98
-
ilevy@chromium.org authored
- Use config --local for properties that should be local. - Remove git fetch retry logic, it should not be necessary with the googlesource hosts. - Include .strip() in GIT.Capture, simplifying other calls. - Safer testing of whether dep revision is a sha. - Fix refs/remotes/ DEPS branch detection Review URL: https://chromiumcodereview.appspot.com/18262002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@209825 0039d316-1c4b-4281-b951-d872f2087c98
-
- 03 Jun, 2013 1 commit
-
-
mcgrathr@chromium.org authored
If ~/.gitconfig contains: [diff] renames = "true" then git diff --name-status will produce output that confuses the parsing in svm.GIT.CaptureStatus and git diff will produce output that confuses the patch command on trybots. Passing --no-renames explicitly counteracts this. Review URL: https://chromiumcodereview.appspot.com/16057018 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@203778 0039d316-1c4b-4281-b951-d872f2087c98
-
- 02 May, 2013 1 commit
-
-
bratell@opera.com authored
BUG=236148 Review URL: https://chromiumcodereview.appspot.com/14104005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@197872 0039d316-1c4b-4281-b951-d872f2087c98
-
- 24 Apr, 2013 2 commits
-
-
pkasting@chromium.org authored
This time, do not use the --config-dir hack on svn < 1.7 for the diff command that runs against a remote URL. This seems to trigger auth prompts (see revert comments on https://codereview.chromium.org/14297017/ ). Review URL: https://chromiumcodereview.appspot.com/14084009 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@196263 0039d316-1c4b-4281-b951-d872f2087c98
-
digit@chromium.org authored
The 'RemoveDirectory()' function in gclient_utils is deprecated and rmtree() should be used instead for consistency. This patch modifies all clients in depot_tools to use rmtree() instead and removes the RemoveDirectory function. + The SVNWrapperTestCase.testRevertNoDotSvn() mocking expectation has been slightly changed. This was required because the test invokes code that used to call gclient_utils.RemoveDirectory() directly, while only gclient_utils.rmtree() was mocked. BUG=NONE R=maruel@chromium.org, ilevy@chromium.org TEST=manually run gclient_utils_test / gclient_smoketest / scm_unittest / gclient_scm_test Review URL: https://chromiumcodereview.appspot.com/14134010 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@196133 0039d316-1c4b-4281-b951-d872f2087c98
-
- 21 Apr, 2013 3 commits
-
-
jam@chromium.org authored
Reverting r195363, r195328 and r195308. gcl upload is hanging for me unless I revert these changes. f:\src\chrome3\src>gcl upload o0m7 at this point, there's no output. If I press enter, I get: Got an exception Command svn diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmp7dwbyp -r 195324:head svn://chrome-svn/chrome/trun k/src/webkit/glue/dom_operations_unittest.cc returned non-zero exit status 1 in f:\src\chrome3\src Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98 Password for 'jabdelmalek': Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98 > Tweak GenerateDiff: > > * Update comment for accuracy > * Keep the base diff command in a variable; this fixes an oversight where GenerateDiff would run svn diff without the --config-dir hack, and makes later refactoring easy > * Apply review comments from https://codereview.chromium.org/14247007/ to existing code > > Review URL: https://chromiumcodereview.appspot.com/14366029 TBR=pkasting@chromium.org Review URL: https://codereview.chromium.org/14297017 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195422 0039d316-1c4b-4281-b951-d872f2087c98
-
jam@chromium.org authored
Reverting r195363, r195328 and r195308. gcl upload is hanging for me unless I revert these changes. f:\src\chrome3\src>gcl upload o0m7 at this point, there's no output. If I press enter, I get: Got an exception Command svn diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmp7dwbyp -r 195324:head svn://chrome-svn/chrome/trun k/src/webkit/glue/dom_operations_unittest.cc returned non-zero exit status 1 in f:\src\chrome3\src Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98 Password for 'jabdelmalek': Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98 > Use --internal-diff on svn 1.7+ to slightly reduce disk thrashing. > > This just saves the need to create and remove an empty directory on every call to GenerateDiff. > > Review URL: https://chromiumcodereview.appspot.com/14064017 TBR=pkasting@chromium.org Review URL: https://codereview.chromium.org/14122021 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195421 0039d316-1c4b-4281-b951-d872f2087c98
-
jam@chromium.org authored
Reverting r195363, r195328 and r195308. gcl upload is hanging for me unless I revert these changes. f:\src\chrome3\src>gcl upload o0m7 at this point, there's no output. If I press enter, I get: Got an exception Command svn diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmp7dwbyp -r 195324:head svn://chrome-svn/chrome/trun k/src/webkit/glue/dom_operations_unittest.cc returned non-zero exit status 1 in f:\src\chrome3\src Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98 Password for 'jabdelmalek': Authentication realm: <svn://chrome-svn:3690> 0039d316-1c4b-4281-b951-d872f2087c98 Username: svn: Can't read stdin: End of file found "Fix typo." > Fix typo. > > Review URL: https://chromiumcodereview.appspot.com/13987010 TBR=pkasting@chromium.org Review URL: https://codereview.chromium.org/14304005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195420 0039d316-1c4b-4281-b951-d872f2087c98
-
- 20 Apr, 2013 1 commit
-
-
pkasting@chromium.org authored
Review URL: https://chromiumcodereview.appspot.com/13987010 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195363 0039d316-1c4b-4281-b951-d872f2087c98
-
- 19 Apr, 2013 3 commits
-
-
pkasting@chromium.org authored
This just saves the need to create and remove an empty directory on every call to GenerateDiff. Review URL: https://chromiumcodereview.appspot.com/14064017 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195328 0039d316-1c4b-4281-b951-d872f2087c98
-
pkasting@chromium.org authored
* Update comment for accuracy * Keep the base diff command in a variable; this fixes an oversight where GenerateDiff would run svn diff without the --config-dir hack, and makes later refactoring easy * Apply review comments from https://codereview.chromium.org/14247007/ to existing code Review URL: https://chromiumcodereview.appspot.com/14366029 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195308 0039d316-1c4b-4281-b951-d872f2087c98
-
pkasting@chromium.org authored
Removes DiffItem, which was unused, and moves _DiffItemInternal below GenerateDiff, now its lone caller. No other code changes, so should be no behavioral change. Review URL: https://chromiumcodereview.appspot.com/14241038 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195262 0039d316-1c4b-4281-b951-d872f2087c98
-
- 18 Apr, 2013 4 commits
-
-
pkasting@chromium.org authored
> Second take at handling users with locally overridden diff-cmds. > > The first take at https://chromiumcodereview.appspot.com/14130006 tried to pass > "--diff-cmd diff", which doesn't work for e.g. Windows cmd users who don't have > a "diff" executable installed. > > This take instead passes the "--internal-diff" switch which tells svn to ignore > any diff-cmd set locally and use its internal diff engine at all times. > > While implementing this I found that the existing code tried to work around this > problem in a different way, by setting up a bogus config dir. Since that > doesn't seem to work for me, and shouldn't be necessary with this patch anyway, > removed that code. > > Review URL: https://chromiumcodereview.appspot.com/14050007 TBR=pkasting@chromium.org Review URL: https://codereview.chromium.org/14188030 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195009 0039d316-1c4b-4281-b951-d872f2087c98
-
pkasting@chromium.org authored
The first take at https://chromiumcodereview.appspot.com/14130006 tried to pass "--diff-cmd diff", which doesn't work for e.g. Windows cmd users who don't have a "diff" executable installed. This take instead passes the "--internal-diff" switch which tells svn to ignore any diff-cmd set locally and use its internal diff engine at all times. While implementing this I found that the existing code tried to work around this problem in a different way, by setting up a bogus config dir. Since that doesn't seem to work for me, and shouldn't be necessary with this patch anyway, removed that code. Review URL: https://chromiumcodereview.appspot.com/14050007 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@194990 0039d316-1c4b-4281-b951-d872f2087c98
-
jam@chromium.org authored
On Windows, I got the following error: f:\src\chrome2\src>gcl commit n3d2 Loaded authentication cookies from C:\Users\jabdelmalek/.codereview_upload_cookies Running presubmit commit checks ... checking owners took a long time: 906ms Got an exception Command svn diff --diff-cmd diff --config-dir c:\users\jabdel~1\appdata\local\temp\tmpu7bui5 content\browser\web_content s\web_contents_impl.cc returned non-zero exit status 1 in f:\src\chrome2\src Index: content/browser/web_contents/web_contents_impl.cc =================================================================== svn: Can't start process 'diff': The system cannot find the file specified. > Explicitly pass "--diff-cmd diff" to "svn diff", for users who have set some other diff tool. > > Review URL: https://chromiumcodereview.appspot.com/14130006 TBR=pkasting@chromium.org Review URL: https://codereview.chromium.org/13877013 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@194945 0039d316-1c4b-4281-b951-d872f2087c98
-
pkasting@chromium.org authored
Review URL: https://chromiumcodereview.appspot.com/14130006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@194740 0039d316-1c4b-4281-b951-d872f2087c98
-
- 15 Oct, 2012 1 commit
-
-
szager@chromium.org authored
Review URL: https://chromiumcodereview.appspot.com/11148019 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@161909 0039d316-1c4b-4281-b951-d872f2087c98
-
- 11 Oct, 2012 1 commit
-
-
szager@google.com authored
Takes into account the new submodule-enabled repository layout. Review URL: https://codereview.chromium.org/11098064 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@161403 0039d316-1c4b-4281-b951-d872f2087c98
-
- 10 Aug, 2012 1 commit
-
-
wittman@chromium.org authored
BUG=138104 TEST= Review URL: https://chromiumcodereview.appspot.com/10826035 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@150952 0039d316-1c4b-4281-b951-d872f2087c98
-