Commit Graph

41 Commits (0927b7eef86dd283507fda2fc71cc7b502aab23c)

Author SHA1 Message Date
maruel@chromium.org 0e0436a662 Move code starting the editor into a common function.
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
14 years ago
rsesek@chromium.org 403a0f9f5a Don't eat newlines in CL descriptions when merging changes using drover.
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
14 years ago
maruel@chromium.org e3db855656 Fix drover regression introduced in r80453.
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
14 years ago
maruel@chromium.org 98385dd58b Convert drover.py to subprocess2.
R=dpranke@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@80453 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 725f1c3b69 Add a warning if the current version of python is not 2.5
R=dpranke@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@80212 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
mirandac@chromium.org 450e50d758 I am a huge fan of drover, but discovered this morning that it wasn't working with my svn client, even though it was version 1.6.15. I did some poking around, and found that because SlikSvn doesn't give a revision number in its --version information dump, it was failing to match the regex in drover.py. I then noticed that the revision number wasn't being used for anything, so I removed it and everything worked great again.
Review URL: http://codereview.chromium.org/6538055

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@75398 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org cb2985fb69 Largely reduce the number of pylint warnings and fix one typo.
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
15 years ago
mattm@google.com 90a685ef1a Fix finding path to gcl when drover is run with a relative path.
BUG=none
TEST=cd ../tempdir && ../depot_tools/drover <some args>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@62497 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1309f81f51 Revert back to use exec() instead of execfile().
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
15 years ago
maruel@chromium.org 8ea22292b7 Fix code that is causing a pylint error in drover.py.
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
15 years ago
laforge@chromium.org 7d1ce06e64 Fix a break in drover.py that prevented webkit merges.
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59179 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org fa410372ba Add pylint to presubmit checks.
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
15 years ago
dglazkov@chromium.org 7aae8fb1b7 Update branch path-finding regex to work directly with WebKit repository.
R=laforge
TEST=use drover.py with WebKit repo -- it should work!
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@58844 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 3a292688b6 Redo of r56893 with fix to support python 2.5.
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
15 years ago
maruel@chromium.org ad0b13da3d Revert "Remove code duplication and improve style."
This reverts commit 850ee065dd.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@56894 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 850ee065dd 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/3126020

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@56893 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
jochen@chromium.org ebd0b54500 Only warn if the local working copy is dirty.
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
15 years ago
sky@chromium.org 8010f07d80 Changes drover not to pass in no_try as it's no longer needed.
Review URL: http://codereview.chromium.org/3025006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@53100 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 6e29d572b5 Add pylintrc and fix style for many scripts.
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
15 years ago
viettrungluu@chromium.org 0c6b52b52e Make drover not eliminate '-'s from commit messages.
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
15 years ago
jochen@chromium.org 0b9e693a9b Add option --local allowing for merging changes into a local working copy.
BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@39603 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
laforge@chromium.org 3529954d9f Fix branching regex to match .*? and not /d+ so that it will match "249s" in
addition to "249"
Review URL: http://codereview.chromium.org/553108

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37203 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org 638044da8e Fix condition where no author would be retrieved (revert on a branch for
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
15 years ago
laforge@chromium.org 2d6af5fc12 Adding branch to branch merge support for drover.
Review URL: http://codereview.chromium.org/554054

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36872 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org 461843e2fc Fix the author search for branches (only an issue on reverts), looking at trunk w/ the revision won't tell you
the correct author.
Review URL: http://codereview.chromium.org/505053

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35009 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org f5a1163b83 Fix a character encoding issue
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34897 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org ee98c9fddb Add eol ignore logic to make webkit merges less problematic.
Review URL: http://codereview.chromium.org/505042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34895 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
laforge@chromium.org 004d2efeba Add a minimum SVN version check to drover, to enforce the 1.5.x requirement.
Review URL: http://codereview.chromium.org/501081

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@34894 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
laforge@chromium.org c4e7bb311e On prompts don't add a new line when printing.
Review URL: http://codereview.chromium.org/414060

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@32713 0039d316-1c4b-4281-b951-d872f2087c98
15 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
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
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
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
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
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
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
maruel@chromium.org 817ba610a1 Fix drover.py style.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26980 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago
laforge@chromium.org d90ad9b76d Drover == tool to rapidly merge/revert off of trunk and branch
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@22565 0039d316-1c4b-4281-b951-d872f2087c98
16 years ago