Commit Graph

418 Commits (e42a1939f1f9f55ebe7ab3c17d67027e36aed233)
 

Author SHA1 Message Date
nasser@codeaurora.org e42a1939f1 Fix for git-svn rebase bug
git-svn rebase will always output 'Current branch <> is up-to-date' when the
branch is up-to-date, even if you pass the --quiet flag(s). This change
specifically squelches that message.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37696 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 61148d07dc git-try was broken by r37650
TEST=none
BUG=none
TBR=nasser

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37692 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
nasser@codeaurora.org cd968c1833 Always return a tuple from GIT.Capture
Review URL: http://codereview.chromium.org/555198

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37685 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 7be5ef2ed0 Change CheckCall behavior when print_error=False
We now return the stderr half of the tuple.
This required a clean up of any usage of CheckCall and GIT.Capture.

Patch contributed by Nasser Grainawi <nasser@codeaurora.org>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37650 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 519a8dd376 Using options.email for svn credential is not a good idea.
It breaks the use case when a dev outside corp wants to send a job's email to someone else.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37644 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 56ca2c246c Remove stale revert.py unit test and fix another test I broke in r37487.
TEST=unit tests
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37618 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 5f423140ba Simplify submitting try jobs directly from rietveld.
trychange.py -R <review_url> is sufficient for try jobs when in a checkout directory.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37616 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org c19d95a4e0 Delete the revert.py tool.
It's been replaced by drover a year ago.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37487 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org a73d793164 Fix the regexp in DEFAULT_WHITE_LIST.
For example, r".*\.c" was triggering for foo.checksum.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37461 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 8912ead3b4 gclient: Keyboard interrupt should not cause request to send stack
Patch-contributed-by: Alexey Marinichev <amarinichev@chromium.org>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37434 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ef77648dd4 Change the default source lists;
Remove *.txt and *.json, add *.pl and *.pm.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37406 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
estade@chromium.org 593258b903 Add a trailing \ when printing filenames for presubmit checks.
This makes it easier to apply commands to a set of files. For example:

Run the command: svn pset svn:eol-style LF \
  chrome/browser/extensions/extension_accessibility_apitest.cc \
  chrome/browser/extensions/extension_accessibility_api_constants.cc \
  chrome/browser/extensions/extension_accessibility_api.h \
  chrome/browser/extensions/extension_accessibility_api.cc \
  chrome/browser/extensions/extension_accessibility_api_constants.h \
  chrome/browser/gtk/accessible_widget_helper_gtk.h \
  chrome/browser/gtk/accessible_widget_helper_gtk.cc \
  chrome/browser/gtk/accessibility_event_router_gtk.h \
  chrome/browser/gtk/accessibility_event_router_gtk.cc \
  chrome/common/accessibility_events.cc \
  chrome/common/accessibility_events.h

requires just 1 copy-paste.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37350 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org b9e7adaa82 Add presubmit_canned_checks.CheckLicense()
It does a regexp search on the file contents to make sure it contains expected license boiler plate.

It is a generalization to implement the equivalent of ubuntu's license check script into the corresponding PRESUBMIT.py files.

TEST=unit tests
BUG=28291

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37338 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
thestig@chromium.org 172b6e7451 Partial revert of r37053. Put back the gcl default CODEREVIEW_SETTINGS as we had it before, except with an updated CC_LIST.
BUG=none
TEST=Using gcl from src/third_party/WebKit sends code reviews to codereview.chromium.org.
Review URL: http://codereview.chromium.org/552144

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37069 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
thestig@chromium.org 4aa4781621 gcl.py cleanup
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/552139

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37053 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
msb@chromium.org d8a637875f Make gclient cleanup a no-op for git
Patch-contributed-by: Nasser Grainawi <nasser@codeaurora.org>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37021 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org eafef3b33e Use --force to reset a git repo before attempting to rebase during gclient sync/update
Patch Contributed By: Nasser Grainawi <nasser@codeaurora.org>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37020 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 3904caa959 Always list the args in the same order
Patch-contributed-by: Nasser Grainawi <nasser@codeaurora.org>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37016 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
maruel@chromium.org 0836c56149 Fix svn mv/cp/ren diff for real this time, for try jobs.
TEST=send a try job with a file moved with modified content
BUG=6825

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36828 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
antonm@chromium.org 41cdced81d First take on zsh-completion functionality for gclient.
It's very basic, only subcommands.

If this would evolve, generation of _gclient should be automized (like a separate command
or some other tool.)

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36521 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org e4af1ab4cf gclient: Add better error reporting when path is not a git repo.
Review URL: http://codereview.chromium.org/505007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36172 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
msb@chromium.org 74f559a723 Correct the value needed to disable auto-updates
Also remove Windows-style line endings.

Patch-contributed-by: Nasser Grainawi <nasser@codeaurora.org>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36145 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
msb@chromium.org 32906d1bce gclient: fix unittests
Review URL: http://codereview.chromium.org/550013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36022 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8ede00e1af Add the capability to filter out files on try job with regexp.
By default, filters out 'ChangeLog'. A pain directly coming from Webkit.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@36008 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org d2e78ff631 Allow gclient revert to remove symlinks
Previously links weren't caught at the appropriate point and instead passed to RemoveDirectory which then rejected them because they were links.

Patch contributed by Nasser <nasser@codeaurora>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35936 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
mhm@chromium.org 346737cf13 Fixed issue with try where patchset is passed.
The new try execution should only be triggered when a user just passes the rietveld issue number. Usually, if your branch has a working patchset already defined, it shouldn't think the user passed it. The code has been updated to force patchset to be None (not 0 or any other number) so that specific occurence wont happen again.

TBR=maruel
BUG=None
TEST=git try, git try --issue=123, git try --issue=123 --patchset=0, should all work fine now.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35889 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
mhm@chromium.org c2190cb26c Allow git-try to try rietveld changes directly.
Some external contributors need their CL's try'd quickly, but currently its not easy unless we patch locally. This will allow you to submit the rietveld issue number and will do the rest automatically. As well, renable the dry_run option. It was removed. 

BUG=None 
TEST=git try --issue 12345
Review URL: http://codereview.chromium.org/481006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35881 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org fd9cbbb7c4 Fix case sensitivity issues and svn move patches for --sub_rep on Windows.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/538009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35839 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 51282ec8bc append_const is not supported on python 2.4.
(which is increasingly becoming a pain to support)

TEST=gcl try --help doesn't throw an error.
BUG=none
Review URL: http://codereview.chromium.org/537004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35832 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 7538b862df Add --webkit option as a shorthand for -s third_party/WebKit.
TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35830 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8d4c15c3ba Change to a git repo before checking git-svn version
TEST=none
BUG=none
R=maruel

Patch contributed by Nasser <nasser@codeaurora>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35817 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
rsesek@chromium.org 0dfc4ef271 Catch ValueErrors when trying to convert the CL issue number in git presubmit hooks
BUG=31695
TEST=none
Review URL: http://codereview.chromium.org/528004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35816 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 54d1f1ae2f Abort gclient sync when a svn command fails.
TEST=a svn locked directory will stop a gclient sync
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35815 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
bradnelson@google.com 4970aa2b74 Using the root codereview.settings seems to be a problem for NACL
(there isn't one in their repo).
They've been manually specifying --host etc for over a week.

Why the change in behavior?

BUG=None
TEST=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35814 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 8dd7cc5c2e git svn --version doesn't work when called outside a git checkout.
TEST=none
BUG=none
TBR=nasser

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35800 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 40f35c3268 Fix unit tests (mostly esthetical)
TEST=none
BUG=none
TBR=bradnelson

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35767 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org f3909bf2d3 Check for the existence of git before running commands.
Checks in the gclient wrapper and when running any gclient git command.

TEST=none
BUG=none

Patch contributed by Nasser <nasser@codeaurora>

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35762 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 0c4016967e Fixed wrong argument placement.
TEST=none
BUG=none
TBR=bradnelson

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35688 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org ce3c8621ea Style fix.
TEST=none
BUG=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35685 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 1c7db8e6ee Add "diff against" support when sending try patches.
This is mostly useful with git when diffing against arbitrary branches.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35684 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org 01d8c1d113 Fix checkout root detection for git.
Add shorthand parameters.

Stop changing the logging level in gcl and some logging changes.

Change SCM.GetCheckoutRoot() to SCM.checkout_root.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35683 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
rsesek@chromium.org 4c098c8509 When running git presubmit hooks, use the changelist's description,
rather than the local commit message's.

BUG=31695
TEST=git cl upload where commit message is missing BUG= but CL description has one. No presubmit error.
Review URL: http://codereview.chromium.org/523101

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35682 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
maruel@chromium.org b6d36495b5 Add back automatic fallback to svn access when http access fails.
It was somehow ripped out by accident.

TEST=none
BUG=none
TBR=bradnelson

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@35284 0039d316-1c4b-4281-b951-d872f2087c98
15 years ago
maruel@chromium.org e2b865ce2b Rips the guts out of git-try since trychange.py is now supper awesome.
TEST=try me (none)
BUG=none
TBR=brad

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

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