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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/4845f0ed.
> 
> 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

Also fixes an msys (git-bash) incompatibility, similar to the one
fixed in crrev.com/4845f0ed.

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

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

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

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

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

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

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

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