Commit Graph

2936 Commits (c0ff2f64e04fb11faf2ac05f1b69084c2d47d39a)
 

Author SHA1 Message Date
iannucci@chromium.org f3e37a0fbb Add better error messages to git_reparent_branch.
R=dhsharp@chromium.org, vadimsh@chromium.org
BUG=538454

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297848 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
luqui@chromium.org b371a1c852 Rename recipes/ to fetch_configs/
We are making depot_tools a proper (chromium) recipe package, which assumes
that recipes are located in recipes/.  So I need to move these other kinds of
recipes out of the way.

BUG=564920
R=dpranke@chromium.org, iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297837 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org 29d5e56cd5 Rietveld: refactor and improve retries with UrlError exception.
BUG=564304
R=sergiyb@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297830 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org 6e1e951984 Rietveld: do retries on timeouts in Mac.
BUG=564304
TBR=sergiyb@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297793 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sdefresne@chromium.org d421f6a477 Fix "git rebase-update" when multiple branch are stale.
Fix a bug that left branches tracking a dead branch if both their parent
and grand-parent were left with no changes after a "rebase-update" step.

Given the following initial state:
  $ git map-branches -v
  origin/master
    a
      b
        c *        [ ahead 1 ]

without this patch, a "git rebase-update" on this tree state would
leave the branch "c" as tracking a non-existing branch "a":

  $ git recursive-rebase
  a up-to-date
  b up-to-date
  c up-to-date
  Reparented c to track a (was tracking b)
  Deleted branch b (was 448d1da).
  Deleted branch a (was 448d1da).
  $ git map-branches -v
  {a:GONE}
    c *

with the patch, we record that the branch "c" is tracking must be
updated twice and we end up in a state were "c" is correctly tracking
"origin/master":

  $ git recursive-rebase
  a up-to-date
  b up-to-date
  c up-to-date
  Reparented c to track origin/master (was tracking b)
  Deleted branch b (was 448d1da).
  Deleted branch a (was 448d1da).
  $ git map-branches -v
  origin/master
    c *            [ ahead 1 ]

BUG=456806

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297792 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
nednguyen@google.com 6df90f329b Allows python line with pylint: disable=line-too-long to have more than 120 chars.
BUG=564100

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297765 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
machenbach@chromium.org c1bb56e730 Roll CQ client changes 7d916d5..f59ed9f
BUG=chromium:561530

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297753 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
machenbach@chromium.org 206729c4e6 Add ability to retrieve cl commit bit on cmd line.
BUG=chromium:563434

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297735 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
cbentzel@chromium.org 473527c7ea rietveld.py: Change three_state_keys to emit "True" or "False" query params rather than 1/2.
Manually generating param strings shows that the 1/2 values do not work.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297732 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org ad6451a79e Roll CQ client changes f5de663..7d916d5
R=sergiyb@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297729 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sergiyb@chromium.org 6a43185c75 Updated cq_client
R=akuegel@chromium.org
BUG=562427

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297726 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sergiyb@chromium.org f56c93bd17 Retry more errors when talking to Rietveld
R=tandrii@chromium.org
BUG=560785

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297701 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
mmoss@chromium.org c349971db4 Fix some path processing to work better on Windows.
R=hinoka@chromium.org
BUG=555036

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297698 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
thestig@chromium.org 13ccc77201 Remove unused CheckSvnModifiedDirectories.
Review URL: https://codereview.chromium.org/1435333005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297676 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
maruel@chromium.org 261fa7db54 Strip trailing / or \ when rolling.
Otherwise it makes CL description like foo/bar// which is ugly.

R=vadimsh@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297670 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org d50452a204 Add shorter option -d for git cl upload --cq-dry-run.
R=rmistry@chromium.org,phajdan.jr@chromium.org
CC=machenbach@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297669 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
agrieve@chromium.org bb54dd4a68 Fix gclient-new-workdir.py
Was broken by the refactor done in
http://crrev.com/900a33fb4df00cf36c87f4c5c11b4390b23e2a03

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297633 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 3add4b62b8 Fix cit.py when ~/.chrome-infra exists but does not have infra.
R=hinoka@chromium.org, stip@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297583 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org e27eb7e62d depot_tools: make CheckLicense warn instead of notify
BUG=553681

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297563 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org d965db3047 depot_tools: move some checks from commit to upload
BUG=553681

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297559 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
smut@google.com 02d2087b9a Add an option to ignore a dirty tree to roll_dep.py
BUG=554638
TBR=maruel
TESTED=locally verified that two deps can be rolled

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297553 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
iannucci@chromium.org 405b87e91b Revert of git_cl/gclient: use python2 (patchset #3 id:40001 of https://codereview.chromium.org/1437773002/ )
Reason for revert:
breaks git-bash on windows

Original issue's description:
> git_cl/gclient: use python2
> 
> Newer distros are defaulting /usr/bin/python to python3, so use python2
> explicitly so we continue working.
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297535

TBR=stip@chromium.org,sergeyberezin@chromium.org,vapier@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297544 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
vapier@chromium.org b0fe123965 git_cl/gclient: use python2
Newer distros are defaulting /usr/bin/python to python3, so use python2
explicitly so we continue working.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297535 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
tandrii@chromium.org 51049267ad Delete git-crup command.
R=iannucci@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297526 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
vapier@chromium.org a81a56e89b gclient: stop using deprecated except syntax
The newer form works with python2 and python3.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297517 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
vapier@chromium.org bb79beaac4 gclient: use the print function
This makes the code work both in python2 and python3.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297516 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sergiyb@chromium.org 150aa7b955 Re-land: Removed virtualenv from depot_tools
Original CL: https://codereview.chromium.org/1437483002/.

R=dnj@google.com, tandrii@chromium.org, dnj@chromium.org, pgervais@chromium.org
BUG=542922, 503067

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297494 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
dnj@google.com 16ab651b2d Revert of Removed virtualenv from depot_tools (patchset #1 id:1 of https://codereview.chromium.org/1437483002/ )
Reason for revert:
This CL over-aggressively removed the Windows bootstrap code used by /gclient.bat, which in turn downloads/installs the Windows toolchain, including Python. Labs can no longer provision Windows bots because of this.

update_depot_tools.bat did more than initialize the virtualenv. It also downloaded and installed Python, Git, and Subversion on Windows systems.

I'm reverting to restore the toolchain so we can create new Windows bots.

Original issue's description:
> Removed virtualenv from depot_tools
>
> This effectively reverts http://crrev.com/1195423002 and
> http://crrev.com/1205873002.
>
> R=pgervais@chromium.org, tandrii@chromium.org
> TBR=pgervais@chromium.org  # i wanna get my Fixit credit today :-)
> BUG=542922,503067
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=297491

TBR=pgervais@chromium.org,tandrii@chromium.org,sergiyb@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542922,503067

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297493 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sergiyb@chromium.org 9ca2fc13f9 Removed virtualenv from depot_tools
This effectively reverts http://crrev.com/1195423002 and
http://crrev.com/1205873002.

R=pgervais@chromium.org, tandrii@chromium.org
TBR=pgervais@chromium.org  # i wanna get my Fixit credit today :-)
BUG=542922,503067

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297491 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
phajdan.jr@chromium.org ff7840a87c depot_tools: add .gitcookies support to gerrit_util
BUG=551403

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297450 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sammc@chromium.org 8990189aed Support merging with conflicts with git-drover.
Currently, git-drover gives up and cleans up if the cherry-pick fails.
This change allows the user to manually resolve conflicts when using
git-drover.

BUG=404755

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297429 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
maruel@chromium.org ccbb746dcc Permits running pylint without pylintrc.
R=iannucci@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297425 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
mmoss@chromium.org 375765c6bf Generalize python_git_runner for use in non-git scripts.
Retrying the change in https://codereview.chromium.org/1415993003/, with
fixes to properly handle being called with either Windows- or
POSIX-style paths (the previous attempt assumed it was always called
with POSIX-style paths under MSYS, which itself was attempting to fix
the assumption that it was always called with Windows-style paths, but
neither assumption was right).

This change doesn't actually use the wrapper in any new places, but
subsequent changes will be made to use it in places where
'exec python' is called directly, like gclient and fetch.

BUG=411518
R=iannucci@google.com, sky@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297401 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
akuegel@chromium.org 50289c267b Revert of Generalize python_git_runner for use in non-git scripts. (patchset #1 id:1 of https://codereview.chromium.org/1415993003/ )
Reason for revert:
Speculative revert in case this caused the bots to fail bot_update.

Original issue's description:
> Generalize python_git_runner for use in non-git scripts.
> 
> Also fixes an msys (git-bash) incompatibility, similar to the one
> fixed in crrev.com/4845f0ed694ff071da5f6ee937a0bce2ea4e6fd2.
> 
> This change doesn't actually use the wrapper in any new places, but
> subsequent changes will be made to use it in places where
> 'exec python' is called directly, like gclient and fetch.
> 
> BUG=411518
> R=iannucci@google.com
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297357

TBR=iannucci@google.com,iannucci@chromium.org,mmoss@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=411518

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297358 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
mmoss@chromium.org 3811235942 Generalize python_git_runner for use in non-git scripts.
Also fixes an msys (git-bash) incompatibility, similar to the one
fixed in crrev.com/4845f0ed694ff071da5f6ee937a0bce2ea4e6fd2.

This change doesn't actually use the wrapper in any new places, but
subsequent changes will be made to use it in places where
'exec python' is called directly, like gclient and fetch.

BUG=411518
R=iannucci@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297357 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
agable@chromium.org f2214673e1 Error out in `gclient config` if --name is relative
This helps prevent behavior such as setting '--name .' so that the .gclient
file contains '.' as the name of the solution, and the .gclient file ends
up a sibling of the .git file, rather than a sibling of the git checkout's
containing directory.

R=iannucci@chromium.org, thestig@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297343 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
thakis@chromium.org 7c4b703a05 Add a recipe for fetching pdfium.
With this, `fetch pdfium` is all that's needed to get a pdfium checkout.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297340 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
dnj@chromium.org 8829c52f4c cit: Add ability to select infra branch.
TBR=hinoka@chromium.org
BUG=None
TEST=local
  - Ran with different branches, seems to work.

R=hinoka@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297284 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
dsansome@chromium.org f4ef3e70dd Retry socket.timeout as well as SSL timeouts (ssl.SSLError is a subclass of socket.error).
To fix this flake:
https://uberchromegw.corp.google.com/i/internal.infra.try/builders/infra-internal-presubmit/builds/1216/steps/bot_update/logs/stdio

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297234 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
thakis@chromium.org 3196346a6b Make gcl uploading work again.
See discussion in https://codereview.chromium.org/1213363002/

BUG=503847

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297230 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
tandrii@chromium.org 3764fa2517 git cl try: default testfilter is no testfilter.
This removes default testfilter value ['defaulttests'] from polluting properties
everywhere.

This also implies that default testfilter is no testfilter or empty list, which
should have equivalent meening in try recipes.

R=phajdan.jr@chromium.org,nodir@chromium.org
BUG=487822

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297228 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sergiyb@chromium.org 7083f3cee5 Update CQ client lib
R=akuegel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297201 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
mark@chromium.org ea1b3d5ed8 Add a fetch recipe for Crashpad
R=iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297180 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
dbeam@chromium.org 5a2af6d9d1 Add long line exception for GEN('#include') in JS browser tests.
It's basically like C++'s #include but in JS.

Why write 1 language when you can write 2?!

R=maruel@chromium.org
BUG=540977

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297065 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
scottmg@chromium.org d4218d4d56 Attempt at making git-drover work on Windows
BUG=404755
R=sammc@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297055 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
johannkoenig@google.com 64f2fc3b2c Add --no-merges to roll_dep.py
Print only the most interesting commit messages.

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297050 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
primiano@chromium.org b9658c343c presubmit: unblacklist third_party/WebKit
The current DEFAULT_BLACKLIST in presubmit_support blacklists by
default third_party/.* in every repo. This requires an adjustement
after the blink merge, as it causing all the blink presubmits to
become noops.

BUG=539768

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297030 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
tandrii@chromium.org 69c68c37b5 Fix in readability improvement in apply_issue.
TBR=pgervais@chromium.org,sergeyberezin@chromium.org
BUG=537417

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297020 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
scottmg@chromium.org ffa2240d63 win_toolchain: Update packaging script to package win10 sdk
R=brucedawson@chromium.org
BUG=491424

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297019 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
tandrii@chromium.org cd95805327 Readability improvement in apply_issue.
R=pgervais@chromium.org
BUG=537417

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

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