Commit Graph

72 Commits (2cc664298bbfb58abcbf6a9de7df33e4c5962185)

Author SHA1 Message Date
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
cmp@chromium.org 5cf7022b80 Turn on git diff copy detection for git-cl upload.
Enable copy detection for git-cl upload.  This makes
it possible to copy a directory containing many files,
add+commit the new path, and then upload a patch to
Rietveld that shows the files were copied.

In my tests, -C -C was needed to pick up a basic
file copy.  -C was not enough.  I'm not sure why
exactly.  The output generated in the diff looks
like:

  sh$ git diff -C -C HEAD~1..HEAD
  diff --git a/slave/Makefile b/slave2/Makefile
  similarity index 100%
  copy from slave/Makefile
  copy to slave2/Makefile
  ...

(This change requires r141676 /
https://chromiumcodereview.appspot.com/10543116/ which
updates upload.py to use --find-copies-harder.)

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@141689 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 9977a2e0f8 Add git cl comments to read rietveld comments without having to use the rietveld UI
R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140865 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org db9b0e3a04 Revert "Turn on git diff copy detection for git-cl upload."
This reverts commit db5a0def78.

TBR=maruel@chromium.org


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140808 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
cmp@chromium.org db5a0def78 Turn on git diff copy detection for git-cl upload.
Enable copy detection for git-cl upload.  This makes
it possible to copy a directory containing many files,
add+commit the new path, and then upload a patch to
Rietveld that shows the files were copied.

In my tests, -C -C was needed to pick up a basic
file copy.  -C was not enough.  I'm not sure why
exactly.  The output generated in the diff looks
like:

  sh$ git diff -C -C HEAD~1..HEAD
  diff --git a/slave/Makefile b/slave2/Makefile
  similarity index 100%
  copy from slave/Makefile
  copy to slave2/Makefile
  ...

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140314 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 373af80c9e Revert r138874 "Automatically adds quotes on Windows when necessary"
This breaks _some_ msysgit uses cases. I'll investigate later.

TBR=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@139114 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ca2b8e764e Automatically adds quotes on Windows when necessary
So that a command like
 "git config rietveld.viewvc-url http://src.chromium.org/viewvc/chrome?view=rev&revision="
works fine.

Fix the description automatically generated for the hooks to be using the same
code than for the one presented to the user.

R=cmp@chromium.org
BUG=
TEST=Tested manually on cygwin, win32, linux


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@138874 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rogerta@chromium.org 420d3b8f0e When converting -m/--message to -t, make sure to handle the case --message=foo
correctly.  Also fix git_cl.py.

BUG=None
TEST=Make sure that the -m command line option to gcl upload/git cl upload
does not add a new message to the rietveld issue.  The string associated to the
--message argument should only be used as the patchset title.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@136922 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 4f6852cca4 Remove python 2.5 compatibility code.
R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@133265 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
kalmard@homejinni.com 6b0051e7c6 Allow overriding base-url in git-cl.
This is useful if git-cl has no way to find out the original svn repo's url
and the user does not wish to configure git-svn and fetch the repository.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@130372 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
rch@chromium.org 92d67165eb Allow longer branch names to be center justified with git cl status.
(Using "." instead of " " so that codereview shows the alignment)

Before:

% git cl status  
Branches associated with reviews:
..CloseIdleSpdySessions:.None
..CloseSockets:.9755011
..GetNegotiatedProtocol:.9958028
..LayeredSocketPool:.9861032
..ReleaseIdleSpdySessions:.9733017
..SSLClientSocket:.9616019
.......Spdy3:.9958023
...SpdyProxy:.None
...SpdyTests:.None
.......crash:.9809033
........leak:.None
......master:.None
.......spdy3:.9958023

After

% git cl status
Branches associated with reviews:
......CloseIdleSpdySessions:.None
...............CloseSockets:.9755011
......GetNegotiatedProtocol:.9958028
..........LayeredSocketPool:.9861032
....ReleaseIdleSpdySessions:.9733017
............SSLClientSocket:.9616019
......................Spdy3:.9958023
..................SpdyProxy:.None
..................SpdyTests:.None
......................crash:.9809033
.......................leak:.None
.....................master:.None
......................spdy3:.9958023

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@130189 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jmbaker@chromium.org a2cbbbb35e Choosing a default remote for determining base_url.
BUG=116057

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@128293 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 82798cbb32 Enforce python 2.6 or later.
TBR=bevc@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@123276 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 71e12a9e41 Update upload.py @ fae51921ad9d
This version of upload.py is slightly less annoying, it won't cancel out if no
patchset title is provided and disable colors all the time.

R=cmp@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@121826 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ukai@chromium.org 78c4b98fc3 Download hooks only in "git cl config"
also, use http download instead of scp,
because scp won't work well on Windows.

BUG=chromium:113153
Review URL: https://chromiumcodereview.appspot.com/9369023

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@121820 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
evan@chromium.org 0af9b70a02 git-cl: split GetRietveldServer from GetIssue
Should be no functional change.
Necessary for a follow-up change I'm making.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@121590 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
evan@chromium.org 5b5d043a5a git_cl: drop migration code
Everyone at this point should have been migrated to the new format.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@121509 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ukai@chromium.org 19bbfa2db2 Fix receive-pack
If we quote as --receive-pack="git receive-pack --reviewer=foo@example.com",
git will try to run "git receive-pack --reviewer=foo@example.com" command
and failed like this

Gerrit Code Review: git receive-pack --reviewer=foo@example.com: not found
fatal: The remote end hung up unexpectedly
Command "git push --receive-pack="git receive-pack --reviewer=foo@example.com" origin HEAD:refs/for/master" failed.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@120337 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
ukai@chromium.org e807781320 Add minimal Gerrit support to 'git cl config' and 'git cl upload'
This is the bare beginnings of Gerrit support for (non-repo) depot_tools,
based on Roland's work.
Differnt from http://codereview.chromium.org/8826015/
 it read codereview.settings and if it has GERRTI_HOST and GERRIT_PORT,
 then "git cl config" configured it for gerrit.
   installs hooks/commit-msg
   git config gerrit.host $GERRIT_HOST
   git config gerrit.port $GERRIT_PORT

 if it has gerrit.host config, "git cl upload" will upload a change
 to gerrit as
   "git push --receive-pack=... origin master"
 it scans description and extract reviewers from R= line.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@120276 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
jam@chromium.org 3108364f7c Revert 119066 until we have consensus.
TBR=ben
Review URL: https://chromiumcodereview.appspot.com/9298002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@119353 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 2b40b89ae1 Update upload.py @827fa087f74d, which includes support for svn 1.7
It also removes the need of manually creating a subject argument.

Other related changes in this CL:
- Reenable the prompt for patchset title in gcl. I'm not sure why it was disabled.
- Remove git cl upload --desc_from_logs flag. --force is already meaningful.

R=cmp@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@119066 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org b0a6391f1c Fix --force implementation to not prompt but still run hooks
I found out that some devs thought that -f just skipped the prompt, but it did
in fact also skip the presubmit checks.
Make -f do what it should, no prompt and just return if the presubmit check
failed.

R=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@117918 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 2e72bb1c2d Overhaul breakpad to optionally disable output. Add git-cl dcommit unit test.
This required fixing the adhoc mock to be more versatile.

TBR=cmp@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@117896 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org eb5edbcfde Add UpgradeToHttps() to reliably and forcibly upgrade all urls to https.
Enable it for git-cl and gcl.

R=nsylvain@chromium.org
BUG=107838
TEST=New connections go through https://


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@117857 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 99ac1c5808 Dedupe codereview.settings parsing code. Add more testing.
So any modification to the defaults is coded at only one place.

TBR=nsylvain@chromium.org
BUG=107838
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@117853 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org ac63715662 Send an IM when hooks are bypassed to git cl dcommit
R=cmp@chromium.org
BUG=25940
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@117850 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
miket@chromium.org 183df1a629 Provide a friendlier error message after Rietveld issue deletion.
As a n0oB to Chrome, I sometimes deleted uploaded CLs on codereview.chromium.org
after looking at them and deciding they were unsuitable for review. I
would then later git cl upload and get a confusing stacktrace about a
404. This change lets the user know why the error happened, and how to
resolve it.

I decided not to auto-scrub the old issue on the client side, because
the 404 might be spurious (server misconfiguration, bug in my code, etc.).
Safer to make the user explicitly run the command.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@116360 0039d316-1c4b-4281-b951-d872f2087c98
13 years ago
maruel@chromium.org 80a9ef1e12 Enforce cwd for GIT functions
GIT.CaptureStatus was assuming os.getcwd() was using all the time, which isn't
true when using trychange.py --sub_rep XXX.

R=dpranke@chromium.org
TEST=
BUG=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@114264 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
supersat@chromium.org 56f4c47459 Reverted accidental commit
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@112766 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
supersat@chromium.org e8043d11af Fix pulling in patches from git subrepos
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@112765 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 379d07a4ff Fix git try. git_try.py imports git_cl.py without calling its main.
Make sure settings is correctly initialized.

TBR=dpranke@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@112222 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org a335365daa Make --send-mail more useful by not requiring -r
Previously, --send-mail required -r to pass. Now it uses the R=|TBR= lines from
the description, which is much more useful.

R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@112221 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org ddd59417c0 Fix case where TBR=foo would remove the -r flag in git-cl
Add unit test!

R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@112220 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
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
maruel@chromium.org 2b38e9cd71 Improve error message when the upstream branch is wrong.
Otherwise, I get a stack trace, which is annoying. Here's an example:

$ git cl upload
Current branch help_text is up to date.

Failed to diff against upstream branch refs/heads/foo!

This branch probably doesn't exist anymore. To reset the
tracking branch, please run
    git branch --set-upstream help_text trunk
replacing trunk with origin/master or the relevant branch


R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@106175 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 7507557332 Do not throw an exception if git cl rebase fails.
Otherwise I get a stack trace and it's annoying as hell.

R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@104770 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
asvitkine@chromium.org 1516995e79 Support for |change| argument to |GetPreferredTrySlaves()|, try 2.
Needed to make it so changes containing only *.mm are only sent to Mac trybots by default.

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@102930 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 6fb14d906b Revert r102783 "Support for |change| argument to |GetPreferredTrySlaves()|."
Cause an infinite recursion in some context.

TBR=asvitkine@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@102836 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
asvitkine@chromium.org c0c424bca4 Support for |change| argument to |GetPreferredTrySlaves()|.
Needed to make it so changes containing only *.mm are only sent to Mac trybots by default.

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@102783 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 32f9f5ed3e Retry r100190 "Change git_cl.py to use subprocess2""
Now with more fixes and take in account subprocess2.check_output() correctness
w.r.t. stderr.

R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@101072 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org d4b4e11328 Revert r100190 "Change git_cl.py to use subprocess2"
Revert r100267 "git cl assumes no shell is used."

It's causing exceptions, r100190 still need some work.

TBR=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100390 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org b10e1c75ed git cl assumes no shell is used.
This is necessary for msysgit usage on windows.

R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100267 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org eafd7ae790 Change git_cl.py to use subprocess2
R=dpranke@chromium.org
BUG=
TEST=


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100190 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 13f623cabf Fix git-cl --contributor flag support for presubmit checks.
Chromium's presubmit check assumes the author is an email address.

R=dpranke@chromium.org
BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@93645 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org cc73ad68ff Remove manual --tbr support and convert it into automatic TBR= detection.
It result in less code, forces uploading the change for eventual review and most
importantly enables the commit queue to correctly handle this.

BUG=
TEST=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@91575 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 63f78b0f63 Need to strip the config result value otherwise it contains a \n.
It was broken in 88979. Someone my limited testing missed that.

TBR=dpranke@chromium.org
BUG=
TEST=

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

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