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

This uses the same trick as git-new-workdir to reuse an existing git
checkout without interfering with it. However, this makes it only usable
on platforms where os.symlink exists.

BUG=404755

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

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

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

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

This tool can automatically set up the necessary git-svn metadata for our
repos that live in SVN but are mirrored to Chrome.

R=iannucci@chromium.org, tandrii@chromium.org
BUG=418973

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

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

This CL fixes some issues with map-branches:
* Branches with no upstream were not being shown.
* -vv from a detached HEAD would crash
* GONE upstreams would crash when git cleaned up in a way that caused
  hash_one to fail

This CL also adds a blue coloring to branches that start with
'branch-heads' for Chromium release branches.

BUG=416530

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

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

R=luqui@chromium.org

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

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

TBR=iannucci@chromium.org

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

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

TBR=iannucci@chromium.org

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

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

BUG=407316

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

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

BUG=407284
R=iannucci@google.com

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

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

R=iannucci@google.com
BUG=261738

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

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

When running make_docs.sh, I get the error:
  asciidoc: FAILED: manpage document title is mandatory
  make: *** [git-cherry-pick-upload.xml] Error 1

I don't fully understand why, or why this hasn't come up before, but it
seems to be complaining about the formatting of "===" in
git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on
Precise.

R=iannucci@google.com

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

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

This extension uploads a fake cherry pick-style diff to rietveld with a modified project parameter. The modified project is intended to be used by the commit queue to attempt to land the change on a branch.

This works by grabbing the parent of the targeted revision and generating the diff. It is intended to be used to CQ trivial cherry picks which apply cleanly on top of other branches without conflicts.

BUG=387111

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

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

Added the 'git-retry' bootstrap command. This can be used to wrap other 'git'
commands around a fault-tolerant retry wrapper.

BUG=295109
TEST=localtest
R=iannucci@chromium.org, petermayo@chromium.org

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

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

This is useful for large repos (like src.git)

R=agable@chromium.org, szager@chromium.org
BUG=

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

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

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