Commit Graph

2280 Commits (2da1ade7b4c4d543b5492fe3c8bafbe1c7b6b874)
 

Author SHA1 Message Date
agable@chromium.org 2da1ade7b4 Add --upstream flag to presubmit_support for Git.
R=hinoka@chromium.org
BUG=368720

Review URL: https://codereview.chromium.org/267513002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267254 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 3f802b8b1f Roll windows git to include htmlpathalt.
This will allow e.g. `git help rebase-update` to work.

R=agable@chromium.org
BUG=238428

Review URL: https://codereview.chromium.org/253243002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267038 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org fb653b65e5 More explicit error message
When running an executable fails, the original error message sent by
the OS is printed, together with a more detailed suggested solution.

BUG=

Review URL: https://codereview.chromium.org/245133003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266908 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 022d06ef61 git new-branch displays an explanatory line.
BUG=

Review URL: https://codereview.chromium.org/253013004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266905 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 208246dcf7 Move docs folder to man.
This makes the depot_tools manpages automatically show up in the effective
MANPATH for mac/linux.

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/259863004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266667 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
bauerb@chromium.org c9cf90ae99 Clear configured merge-base when switching upstream.
Otherwise, the old merge-base value can confuse the hell out of `git cl upload`.

BUG=none

Review URL: https://codereview.chromium.org/252683003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266648 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 280f250691 Add script to depot_tools to push html directory to gs bucket.
R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/246813003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266590 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 4dfb86684c Add more flushes to gclient_utils
BUG=

Review URL: https://codereview.chromium.org/250803012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266255 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 69995f4984 Fix gclient to correctly check out remote refs during update.
Currently, any bot run with "--revision=project@origin/master" fails, because
it fetches the remote ref into refs/remotes/origin/master, but then checks out
refs/heads/master, which hasn't been rolled forward. This is very similar to
the bug fixed by https://codereview.chromium.org/85473007

However, I am very wary of this patch, because I am worried about changing
something commented with " For compatibility...". Marc-Antoine, please comment.

R=maruel@chromium.org, smut@chromium.org, stip@chromium.org

Review URL: https://codereview.chromium.org/244253007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266251 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
jrobbins@chromium.org a4c03054cb Process first branch status request before spawning threads.
BUG=341052

Review URL: https://codereview.chromium.org/213573004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266219 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 776a2c3fc7 Python fallback for git cache bootstrap
This is because the version of unzip on osx doesn't support zip64, so it can't
unzip large repositories like blink.

BUG=261741

Review URL: https://codereview.chromium.org/251413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266151 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 2f64f78a07 logged changed paths list
This should help debugging should presubmit failures on a CQ.

BUG=

Review URL: https://codereview.chromium.org/250383006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266063 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 356cb5f4d6 Comment out lkcr/lkgr fetching from chromium/src.git's git cache
This isn't doing anything, and is currently costing 20 seconds of idle time
per bot_update run.  Lets remove it until we convert lkcr/lkgr to tags.

BUG=261741

Review URL: https://codereview.chromium.org/256683002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@266055 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
smut@google.com ac296200eb Adding custom environment variable support to presubmit_canned_checks.GetUnitTestsInDirectory
I want to run Python unit tests as part of my presubmit, and those unit tests require PYTHONPATH to be set the way it would be set when the modules they test are running.

Review URL: https://codereview.chromium.org/250693002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265998 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
maruel@chromium.org 7861ac1c2b Reduce auto_stub.py by removing python 2.6 support code.
This makes this file even easier to read and python 2.6 support is not needed
anymore.

R=iannucci@chromium.org
BUG=

Review URL: https://codereview.chromium.org/238233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265799 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
maruel@chromium.org f182f61cd2 Remove me and nirnimesh from WATCHLISTS.
R=iannucci@chromium.org
BUG=

Review URL: https://codereview.chromium.org/247633002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265793 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 6d8115d009 Eliminate all interactive terminal prompts from git.
BUG=

Review URL: https://codereview.chromium.org/247493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265735 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com a2aec97d74 gclient_scm: Assume URLs containing 'googlesource' are for Git repos
Fixes this flow, which currently assumes we're using an svn checkout:

gclient config https://chromium.googlesource.com/chromium/blink
gclient sync

BUG=

Review URL: https://codereview.chromium.org/246903005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265369 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com a9d9aa429f gclient: Only _DeleteOrMove if the destination directory is non-empty
BUG=364601

Review URL: https://codereview.chromium.org/246433005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265298 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com dabbea27f0 add --ignore-submodules to apply_issue.py
Apply_issue should not try to check if there are modified files within submodules.

BUG=

Review URL: https://codereview.chromium.org/246093002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265115 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 6cd41b6916 Show input prompt even on error.
BUG=

Review URL: https://codereview.chromium.org/246123002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265112 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
stip@chromium.org 3031d733c4 Revert of Run `svn cleanup` before every update and reset. (https://chromiumcodereview.appspot.com/240503007/)
Reason for revert:
It's inconclusive if this actually helped the bots, so reverting.

Original issue's description:
> Run `svn cleanup` before every update and reset.
> 
> Testing on a bot with an 'unclean' Chromium checkout:
> 
> Unpatched `gclient revert -v -v -v --nohooks --upstream` (unclean checkout)
> real    9m14.280s
> user    0m37.238s
> sys     0m37.738s
> 
> Patched 'gclient revert -v -v -v --nohooks --upstream'  (unclean checkout)
> real    5m50.065s
> user    1m18.889s
> sys     0m57.860s
> 
> ---------------- after patched gclient revert run (cleans the checkout)
> 
> Unpatched 'gclient revert -v -v -v --nohooks --upstream' (clean checkout)
> real    0m21.602s
> user    0m24.966s
> sys     0m13.969s
> 
> Patched 'gclient revert -v -v -v --nohooks --upstream' (clean checkout)
> real    0m27.467s
> user    0m28.382s
> sys     0m22.629s
> 
> BUG=336983
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=264753

TBR=dpranke@chromium.org,iannucci@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=336983

Review URL: https://codereview.chromium.org/245293003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265093 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 98e82e1dbc --ignore_deps for apply_issue
Bot_update takes care of running gclient sync after apply_issue, so this is
unnecessary.

BUG=

Review URL: https://codereview.chromium.org/242433002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265031 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org f1d73ebb9c Fix url parameter to DefaultIndexPackConfig().
BUG=349576

Review URL: https://codereview.chromium.org/245303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265012 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 3fd55f9520 Automatically reauthenticate to Rietveld
Added automatic detection of OAuth2 token expiracy. Token is
automatically renewed when necessary.

BUG=363825

Review URL: https://codereview.chromium.org/243323003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@264871 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
stip@chromium.org c310473cf5 Run `svn cleanup` before every update and reset.
Testing on a bot with an 'unclean' Chromium checkout:

Unpatched `gclient revert -v -v -v --nohooks --upstream` (unclean checkout)
real    9m14.280s
user    0m37.238s
sys     0m37.738s

Patched 'gclient revert -v -v -v --nohooks --upstream'  (unclean checkout)
real    5m50.065s
user    1m18.889s
sys     0m57.860s

---------------- after patched gclient revert run (cleans the checkout)

Unpatched 'gclient revert -v -v -v --nohooks --upstream' (clean checkout)
real    0m21.602s
user    0m24.966s
sys     0m13.969s

Patched 'gclient revert -v -v -v --nohooks --upstream' (clean checkout)
real    0m27.467s
user    0m28.382s
sys     0m22.629s

BUG=336983

Review URL: https://codereview.chromium.org/240503007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@264753 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org e7f4e02b5d Fixed reauthentication issue
Renewal of OAuth2 credentials did not work on appengine because it
replies with 302 instead of 401 when authentication fails. Configured
it to attempt credentials renewal on a 302.

Of course this will prevent any 302 from working normally, but it works
with Rietveld since it does not use 302.

BUG=319446

Review URL: https://codereview.chromium.org/238273011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@264639 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org f372610b02 Make Lockfile._remove_lockfile more robust on win32
Sometimes, removing lockfiles fails on windows, for obscure reasons.
Following advice from gclient_utils.rmtree, lock file removal has
been improved by using the builtin executable 'del' and retrying 3
times in case it fails.

BUG=

Review URL: https://codereview.chromium.org/240653002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@264557 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com b1b5457a14 branch heads fix
--with_branch_heads doesn't work with cache_dir, this fixes it.

BUG=

Review URL: https://codereview.chromium.org/239083007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@264331 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 3f23cdf56d Abort git tools if git repo has too many local branches.
This is a stopgap to prevent people with >20 local branches from running tools
like 'git rebase-update'. This usually indicates that the user isn't in the
habit of cleaning up old branches, which makes these tools unlikely to be useful
in the current state of their repo anyway.

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/238213006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263978 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
djacques@chromium.org 7b654f5942 Added implicit empty password to 'presubmit_support.py'
BUG=363477
TEST=localtest

Review URL: https://codereview.chromium.org/238603002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263781 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 92c300923c Added POST capability to oauth Rietveld
BUG=319446

Review URL: https://codereview.chromium.org/236093002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263750 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 72c413ac41 Move walkthrough to end of tutorial, add real TL;DR section.
R=scottmg@chromium.org
BUG=261743

Review URL: https://codereview.chromium.org/238203002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263746 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org e722300a14 Add a bleeding-edge git version mode to depot_tools.
R=mmoss@google.com, mmoss@chromium.org
BUG=238428

Review URL: https://codereview.chromium.org/236303002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263544 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org cb67a380fa trychange.py: create patch refs in refs/patches/
In Git-mode, the previous version of code created a ref in
refs/heads/refs/patches/...  instead of refs/patches/....
This commit fixes the problem.

R=maruel@chromium.org, agable@chromium.org
BUG=362264

Review URL: https://codereview.chromium.org/233913002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263439 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org 8129432fb1 Put patches to refs/patches/<user>/<name>
When using Git, trychange.py used to put patches to refs/patches/<name>
refs, where <name> is a name of a patch. Now the using the username as a part
of the path.

This way we have better control over permissions per user basis

R=agable@chromium.org, iannucci@chromium.org
TEST=Sent a change to quickoffice try server. Master and slave do not
     need to be modified because the ref file in master branch points to
     the correct branch name

Review URL: https://codereview.chromium.org/231663005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263432 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org bf157b44ec Fix empty section appearing in git config for every rebase-update.
Previously a `[depot-tools "rebase-update"]` section would show up in the
.git/config on every `git rebase-update` cycle.

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/228353003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263423 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
wittman@chromium.org 9630aa2bd5 Run get_toolchain_if_necessary.py with depot_tools Python under Cygwin
get_toolchain_if_necessary.py contains a number of Windows-isms, including
computing hashes on Windows-style path names, so does not work under
Cygwin. This change reruns it under depot_tools' Windows Python if run
from Cygwin Python.

Review URL: https://codereview.chromium.org/233563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263301 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 3c66983961 Improvements and bugfixes to the depot_tools doc generation process.
Works on linux in addition to OS X now.

TBR=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/234733003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263292 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scr@chromium.org f1eccafb1c Make it possible to refer to github-style URLs.
BUG=362248

Review URL: https://codereview.chromium.org/233333003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263252 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 5724c961f6 Abort `git cl push` if pushing into a local branch.
R=agable@chromium.org, szager@chromium.org
BUG=338102

Review URL: https://codereview.chromium.org/224863006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263202 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 21980029dc Add a tutorial / walkthrough for pure-git workflow.
TBR=agable@chromium.org, szager@chromium.org
BUG=261743

Review URL: https://codereview.chromium.org/225433003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nednguyen@google.com 2d8c977b8e Add file:// case in presubmit_canned_checks.CheckLongLines
BUG=

Review URL: https://codereview.chromium.org/234293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263142 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 97a04f2055 gclient: fix deletion warning for checkouts created with "gclient config --name ."
BUG=skia:1945

Review URL: https://codereview.chromium.org/226613011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263081 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 46d09f6c6c SplitUrlRevision when obtaining the cache_dir in gclient_scm.GetActualRemoteURL
BUG=361155

Review URL: https://codereview.chromium.org/230773002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@263038 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com c3e09d2303 Fix for GitWrapper._Capture
BUG=361155

Review URL: https://codereview.chromium.org/232993003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262977 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 4039b31851 Fix to path search redux.
TBR=agable@chromium.org,hinoka@chromium.org
BUG=

Review URL: https://codereview.chromium.org/232093002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262832 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 6b5faf51dd Fix PATH searching for Windows.
I am TBR-ing everything today.

TBR=agable@chromium.org,hinoka@chromium.org

Review URL: https://codereview.chromium.org/232083002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262831 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 333087e2c5 Fix upload.py to properly use a local logger
When rietveld.py overrides upload.py's logging module, it generally works fine...
until someone tries to run upload.py with any level of verbosity. Then the
calls to logging.getLogger and logging.INFO/logging.DEBUG fail. This patches
upload.py to properly use a module-scope logger so that rietveld.py doesn't
have to perform invasive surgery, and everything just works.

This version of upload.py taken from upstream Rietveld at:
changeset:   1267:d7b39eca7dbe
branch:      chromium

R=djacques@chromium.org, maruel@chromium.org

Review URL: https://codereview.chromium.org/221423007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262793 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 1f4e71b0b0 Fix order of format string parameters.
BUG=

Review URL: https://codereview.chromium.org/231623002

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