Commit Graph

117 Commits (c144e06bcdf9bc6b04f8627cf8caa19fc05ceac3)

Author SHA1 Message Date
jbroman@chromium.org 615a262dcb Make git-cl more accurately imitate git's editor selection process, and respect $VISUAL.
It is somewhat surprising when git-cl, which acts as a git subcommand, launches
a different editor. In particular, git has a config option (core.editor) which
specifies the editor that should be used. Since we already respect $GIT_EDITOR,
it makes sense for git-cl to respect core.editor and $VISUAL as well.

R=maruel@chromium.org
BUG=237504

Review URL: https://chromiumcodereview.appspot.com/14854003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@198101 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
bratell@opera.com f267b0e55c Fix 236148: Avoid triggering a pager in internal git commands.
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
12 years ago
maruel@chromium.org e52678e0ed Update the R= line with the actual list of reviewers that approved the CL.
This makes the commit logs much more useful for a build sheriff. Not only he
sees who committed the CL but see who approved it directly at the log. This
should help build sheriffs when they fail to contact the author and want to
fallback on the reviewer for quick questions.

R=dpranke@chromium.org
BUG=76730

Review URL: https://chromiumcodereview.appspot.com/13800021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@196786 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org c6f60e8906 Fix R= line handling when there is no value and improve presubmit TAG line regex
Make it more consistent across the tool. Using \s also includes \n, which
confuses the tool.

Add more tests.

R=iannucci@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/14265007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@195214 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
janx@chromium.org 104b2db2a0 Add missing word "be" in CL description comments
s/This will displayed/This will be displayed/g

BUG=

Review URL: https://chromiumcodereview.appspot.com/13811053

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@194907 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
zimmerle@gmail.com 3cdcf56c58 Ensures that local git config is used while checking if it is a Git-svn repo.
If no `--local` option is passed to git config command line tool, it will relies
on the local repository and then to the user configuration ($HOME/.gitconfig).
In case the user has - for some reason - a svn repository configured in this
user configuration, the checking: `git config --get-regexp ^svn-remote\.` will
accuse that there is svn repo and so the `git cl tool`. This patch just add
the option `--local` to the git config command line tool, avoiding this
situation.

R=maruel@chromium.org,dpranke@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/13884014

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193987 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
rogerta@chromium.org 4a6cd04c87 Remove trailing '\n' from last-upload-hash branch property.
BUG=None

Review URL: https://chromiumcodereview.appspot.com/14143003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193943 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 78936cbc80 Switch ChangeDescription usage to be stricter.
Include all the preparatory work to eventually update the R= line to match the
actual reviewers.

The goal here is that ChangeDescription becomes the official implementation for
handling and modifying commit messages accross git-cl, gcl and the commit queue.

This change does slightly tweak the spacing between the hot lines.
It is done on purpose to make them consistent.

R=dpranke@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/13741015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193514 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org eb52a5caec Make git-cl accepts multiple --reviewers and --cc arguments.
It makes sure the resulting options.reviewers and options.cc are internally
consistent by splitting comma separated items.

R=iannucci@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/13843002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193496 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
koz@chromium.org c71927873f Make warning for mismatched local and remote patchset more clear.
Review URL: https://chromiumcodereview.appspot.com/13956002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193257 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
pdr@chromium.org 98ca6624fc Change "git cl patch" to say "Committed patch locally."
Currently, if "git cl patch" succeeds it prints:
Committed patch.
This patch changes "git cl patch" to print:
Committed patch locally.

BUG=


Review URL: https://chromiumcodereview.appspot.com/13801021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@193206 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org b021b32ac6 Do not systematically update the description on CL close.
This is not always necessary, like for "git cl set_close".

R=dpranke@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/13741014

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@192829 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
adamk@chromium.org 36f47304a6 Add -s as a short option for --send-mail
R=dpranke@chromium.org


Review URL: https://chromiumcodereview.appspot.com/13612003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@192439 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
dmikurube@chromium.org 07d149fbb0 Fix a case branch...rietveldissue is None.
BUG=None
NOTRY=true


Review URL: https://chromiumcodereview.appspot.com/13513002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@192050 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
koz@chromium.org 5974d7a5f2 Warn when git cl upload might be overwriting a newer patchset.
Review URL: https://chromiumcodereview.appspot.com/12646011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@191895 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
rogerta@chromium.org 43e34f0ba8 Make sure to use title if specified as default message when uploading an issue
to rietveld for the first time.  This came up in a discussion with Nico about
changing -m for -t in the git cl upload command.

BUG=None

Review URL: https://chromiumcodereview.appspot.com/12965015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@190399 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
rogerta@chromium.org caa1655dd6 Save the GIT hash of HEAD when uploading to rietveld.
Review URL: https://chromiumcodereview.appspot.com/12811006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@188807 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 051ad0e435 Always add watchlists on upload
Move watchlist generation out of RunHooks so that bypass-hooks
does not skip watchlists.

BUG=163406


Review URL: https://chromiumcodereview.appspot.com/12295004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@185979 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
sbc@chromium.org 5e07e0608c git cl upload now diffs HEAD rather than working tree
BUG=179131
TEST=./tests/git_cl_test.py


Review URL: https://chromiumcodereview.appspot.com/12388027

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@185366 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
groby@chromium.org 411034a2bf Added command-line way to close issues.
BUG=none


Review URL: https://chromiumcodereview.appspot.com/12330131

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@184652 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
sadrul@chromium.org 34b5d82686 tyop: 'patchsets' seems to be the correct key, not 'patchset'.
BUG='git cl dcommit' fails


Review URL: https://chromiumcodereview.appspot.com/12300006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@183051 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 16b514092c Fix parameters for git_cl and gcl.
TBR=maruel@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/12300005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@183022 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 25a4ab4397 Add patchset number on manual commit comment.
R=cmp@chromium.org, maruel@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12276007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@182861 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org b85a316315 Make gcl commit/git cl dcommit append a commit notification to rietveld.
R=maruel@chromium.org
BUG=163426

Review URL: https://chromiumcodereview.appspot.com/12047089

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@178975 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 375a902f83 Add short options for git cl presubmit
Adding -u and -f as short options for --upload and --force.
There is precedent for these short options elsewhere in
git_cl.py

TBR=maruel@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11783007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@175310 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ukai@chromium.org 8ef7ab251c Don't call settings.GetIsGerrit() before parser.parse_args()
settings.GetIsGerrit() would invoke logging.basicConfig() and
preemtps the basicConfig for verbose option in parser.parse_args.

R=maruel@chromium.org,ilevy@chromium.org
BUG=162600

Review URL: https://chromiumcodereview.appspot.com/11418171

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169843 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org a78f7c0271 Rollback UpgradeToHttps for viewvc links
- Many chrome-internal viewvc links do not support https.  UpgradeToHttps
  was added 10 months ago  and continues to generate broken viewvc links.

Reverts part of crrev.com/9214004

BUG=107838

Review URL: https://chromiumcodereview.appspot.com/11412161

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169815 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 4bac4b5517 Create CachingRietveld to automatically cache results for presubmit checks.
Multiple presubmit checks may call the same function multiple times, so it's
worth caching the results to speed up the presubmit check run.

Convert presubmit_support, git-cl and gcl to use it.

R=dpranke@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11280143

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169726 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org 828801956f Add logging in git_cl::CMDupload
Add some logging when CMDupload is passed a verbosity option.

R=maruel@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/11418148

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169434 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org 0f58fa88ef git_cl sanity checks
Added checks:
- Block upload of a diff from sha not in current branch
  (this includes tracking against an unrebased local master)
- Block upload of a diff containing shas from origin/master
  (should never happen)

- Use explicit calls to git merge-base instead of calling git diff
   with "<branch>..." which implicitly uses merge-base.

BUG=157503

Review URL: https://chromiumcodereview.appspot.com/11262057

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@165887 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ukai@chromium.org 259e46891c git-cl: show dirty files if any
R=chase@chromium.org,szager@chromium.org,maruel@chromium.org
BUG=157398
Review URL: https://codereview.chromium.org/11262004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@164026 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
sivachandra@chromium.org aebe87f424 Add gerrit Change-Id to commit messages if they do not have one.
BUG=156729


Review URL: https://chromiumcodereview.appspot.com/11236013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@163366 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
iannucci@chromium.org 7954005862 Allow users of git cl to disable git copy detection entirely.
Depends on rietveld cl: https://codereview.appspot.com/6726050/
BUG=155511

Review URL: https://chromiumcodereview.appspot.com/11195012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@163092 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org c22ea4bc1d Make repos without VIEW_VC also post Committed to the codereview.
R=maruel@chromium.org
BUG=153446


Review URL: https://chromiumcodereview.appspot.com/11094033

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@160960 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
iannucci@chromium.org 53937ba767 Add option to specify similarity level for git diff operations on commandline
BUG=125983

Review URL: https://chromiumcodereview.appspot.com/10945002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@159732 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ilevy@chromium.org f3b2123a71 Disable jobs sent directly to triggered bots
- and display a warning message

BUG=146713


Review URL: https://chromiumcodereview.appspot.com/10956062

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@158377 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 072d94b68f Do not enforce HEAD when a revision is not specified.
This brings back git cl try to try at LKGR instead of HEAD, which is coherent
with git-try and gcl try.

R=rogerta@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/10963013

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@157810 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
binji@chromium.org 0281f52cf3 Running git cl patch sets the rietveld patchset.
BUG=none


Review URL: https://chromiumcodereview.appspot.com/10907229

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@156796 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
iannucci@chromium.org 1512ab681a Fix git_cl diffstat to use -l100000 to match upload.py
Enables git to correctly detect copies and renames simultaneously.

BUG=144408


Review URL: https://chromiumcodereview.appspot.com/10915190

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@155899 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 1519240e06 Add git cl try that tries from Rietveld.
Thin wrapper to process --bot and --testfilter to keep compability with gcl try
and git-try and pass the data directly to Rietveld.

R=rogerta@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/10916118

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@155176 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
sbc@chromium.org 495ad15721 Add --force option for presubmit command which
allows one to run the presubmit script without
submitting locally (alternative would be to make 
this a warning I guess).

Also, pass option.verbose through to DoGetTrySlaves()
so it will log which PRESUBMIT files are taking part
in the decision.

BUG=

Review URL: https://chromiumcodereview.appspot.com/10915072

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@154838 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 4c422e9b8c options.from_logs is not used anywhere since it's the default.
R=rogerta@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/10887035

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@153976 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
erg@chromium.org 1a17398a93 --bypass-hooks should bypass all checks, including descriptions checks.
(Adding this after the pretty bad build bustage today.)


Review URL: https://chromiumcodereview.appspot.com/10891039

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@153966 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 5242430342 Enforce coherent type handling in git_cl.py
Issue and patchset can only be int, so store them as ints.
This fixes git cl comment, which was broken by r152756.

R=petermayo@chromium.org
BUG=


Review URL: https://chromiumcodereview.appspot.com/10894019

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@153885 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
brettw@chromium.org ac0ba33c80 Add the ability to set the upstream branch
I can never remember the syntax (and always forget I have to specify the branch to set the upstream branch on) when using "git branch".

This patch just allows git-cl upstream to set the branch if an argument is provided. With no arg it prints the current one as it does today.

Review URL: https://chromiumcodereview.appspot.com/10825285

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@150945 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
joshua.lock@intel.com 426f69b485 Remove the use of urllib for SSL connections
Using urllib for SSL connections when behind a proxy is known to be
broken.

Upstream has fixed this in urllib2 in Python 2.6.3 and newer so
replace uses of urllib for SSL connections with urllib2 methods.

R=maruel@chromium.org
BUG=134165
TEST=gclient sync behind corporate proxy. Submitting this CL with git_cl.


Review URL: https://chromiumcodereview.appspot.com/10825107

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149742 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jamesr@chromium.org 35d1a84d76 Remove autogeneration of TEST= and automated check
Review URL: https://chromiumcodereview.appspot.com/10827059

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@148672 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 49e3d807fd Fix stats output to be always the same and coherent with what is committed.
git cl dcommit statistics were not using --find-copies-harder, scaring the user
off.

R=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10795003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147343 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org e84b7541ce Add test for git-svn with submodule/merge layout.
Review URL: https://chromiumcodereview.appspot.com/10543151

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@142479 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
szager@chromium.org 9bb85e2d87 Add support for new repo topology, with submodule-specific merge commits
on origin/master.

Review URL: https://chromiumcodereview.appspot.com/10537117

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