Since we already checked out all files that were touched in the revision
to revert, it should just work[tm].
BUG=64643
R=agable@chromium.org, maruel@chromium.org, phajdan.jr@chromium.org
TEST=tested manually that svn merge -r (without -N) reverts directory deletes
Review URL: https://codereview.chromium.org/22814005
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@219094 0039d316-1c4b-4281-b951-d872f2087c98
Sample output:
$ drover --merge 196360 --milestone 27
Not all platforms have same branch number for M27.
Here's a list of platforms on each branch:
-(1453): win, ios, cf, mac, linux, android
-(1460): cros
Which branch? ('q' to cancel) 1453
Review URL: https://chromiumcodereview.appspot.com/14544004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@198282 0039d316-1c4b-4281-b951-d872f2087c98
- Improve SVN heuristic by using cutoff of 180 days instead of
120. I've verified this won't cause problems with the repos
we use. (the closest is blink ToT and chrome, blink ToT
refers to a revision in chrome from 9 months ago)
- Alert if using local drover.properties file. Webkit devs had
a drover.properties file that hardcodes svn.webkit.org, which
makes drover point to the wrong revision.
BUG=227168
Review URL: https://chromiumcodereview.appspot.com/13730015
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@192641 0039d316-1c4b-4281-b951-d872f2087c98
Building on crrev.com/12670008, add support for blink svn. The svn
revision for blink is sufficiently different from chromium that we
can revert blink changes without further logic changes. The order of
alternative repos corresponds roughly to the expected rate of use.
TEST=Tried reverting some blink revs.
Review URL: https://chromiumcodereview.appspot.com/13448004
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@192396 0039d316-1c4b-4281-b951-d872f2087c98
* Use base chrome svn url for reverts to work with
branches and tools repos.
* Add heuristic to drover so it can search multiple
svn repos for the likely revision to revert.
Each of chrome, chrome-internal, native_client are separated by
more than 20k revisions, so we can programmatically determine
which repo the user wants to revert with high confidence.
TESTS=
- pylint (part of presubmit)
- tried recent tools/build chrome revision
- tried NaCl revision
- tried NaCl revision with --no-alt-urls (got rev from chrome)
- tried NaCl without valid svn credentials (got rev from chrome)
Review URL: https://chromiumcodereview.appspot.com/12670008
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@188792 0039d316-1c4b-4281-b951-d872f2087c98
Put a blank line in between drover title and message.
Also include snippet of commit title in drover title,
but keep total title line length below 50 chars.
Review URL: https://chromiumcodereview.appspot.com/12656003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@187329 0039d316-1c4b-4281-b951-d872f2087c98
This fixes the following crash:
Traceback (most recent call last):
File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 682, in <module>
sys.exit(main())
File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 678, in main
return drover(options, args)
File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 493, in drover
options.branch = getBranchForMilestone(options.milestone)
File "/usr/local/google/home/pliard/ssd/depot_tools/drover.py", line 393, in getBranchForMilestone
version = string.split(parameters[2], '.')
IndexError: list index out of range
Sending crash report ...
args: ['/usr/local/google/home/pliard/ssd/depot_tools/drover.py', '--merge', '175139', '--milestone', '25']
cwd: /mnt/ssd/pliard/chromium/src/drover
exception: list index out of range
host: vox.par.corp.google.com
stack: File "/usr/local/google/home/pliard/ssd/depot_to
user: pliard
version: 2.7.3 (default, Aug 1 2012, 05:14:39)
[GCC 4.6.3
This function is called when the --milestone switch is provided. It requests
omahaproxy to fetch the branch corresponding to the provided milestone.
This function expects some CSV data coming from omahaproxy although it appeared
to actually receive the same HTML data that a browser receives when requesting
http://omahaproxy.appspot.com (user agent issue?).
Review URL: https://chromiumcodereview.appspot.com/11801007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175337 0039d316-1c4b-4281-b951-d872f2087c98
No space between -- and merge.
Review URL: https://chromiumcodereview.appspot.com/10428002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138562 0039d316-1c4b-4281-b951-d872f2087c98
The previous code erroneously took the lowest-valued branch.
Review URL: http://codereview.chromium.org/8888028
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@113681 0039d316-1c4b-4281-b951-d872f2087c98
Windows users wouldn't get the same behavior on git cl vs gcl.
Improve automatic CRLF<->LF conversion, some gcl users would be \n repeated in
their description depending on the editor used.
R=dpranke@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8360007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@107106 0039d316-1c4b-4281-b951-d872f2087c98
BUG=80589
TEST=Merge a CL using drover and when prompted to upload, check that the original CL description still has its linebreaks.
Review URL: http://codereview.chromium.org/6893095
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@83561 0039d316-1c4b-4281-b951-d872f2087c98
getSVNInfo() is expected to fail in some use case. Make this behavior explicit.
R=dpranke@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/6881008
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@81970 0039d316-1c4b-4281-b951-d872f2087c98
Most of them are style issues or variable aliasing.
TEST=Can almost enable pylint warnings
BUG=none
Review URL: http://codereview.chromium.org/4360002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@64908 0039d316-1c4b-4281-b951-d872f2087c98
It seems execfile() has different properties than exec().
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3448001
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59407 0039d316-1c4b-4281-b951-d872f2087c98
The previous 'fix' would fail if drover.properties would contain FILE_PATTERN = None
or something similar.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3363013
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59254 0039d316-1c4b-4281-b951-d872f2087c98
This tool has been quite useful noticing errors in the past and I'd have avoided a breakage in r58936 if I had run it.
Had to fix a few scripts first.
BUG=none
TEST=new test
Review URL: http://codereview.chromium.org/3337018
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59107 0039d316-1c4b-4281-b951-d872f2087c98
Original Description:
Remove code duplication and improve style.
Create a Popen function to reduce code duplication.
Use RemoveDirectory where relevant.
Make drover slightly more posix friendly.
Review URL: http://codereview.chromium.org/3199011
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@57083 0039d316-1c4b-4281-b951-d872f2087c98
Create a Popen function to reduce code duplication.
Use RemoveDirectory where relevant.
Make drover slightly more posix friendly.
Review URL: http://codereview.chromium.org/3126020
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@56893 0039d316-1c4b-4281-b951-d872f2087c98
That change allows for merging multiple revisions into a local working copy.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/3041034
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@54399 0039d316-1c4b-4281-b951-d872f2087c98
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
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
something that was on trunk, svn info only knows about it when it's ref by trunk
url).
Also added an author override, useful for webkit merges or double reverts
Review URL: http://codereview.chromium.org/551137
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37024 0039d316-1c4b-4281-b951-d872f2087c98
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
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
dbeam@chromium.org
jochen@chromium.org
tapted@chromium.org
laforge@chromium.org
ilevy@chromium.org
maruel@chromium.org
pliard@chromium.org
hinoka@google.com
tony@chromium.org
jhawkins@chromium.org
rsesek@chromium.org
mirandac@chromium.org
mattm@google.com
dglazkov@chromium.org
sky@chromium.org
viettrungluu@chromium.org
chase@chromium.org
nsylvain@chromium.org