58 Commits

Author SHA1 Message Date
szager@chromium.org
937159d61a Fix logic for determing remote name from remote branch.
BUG=413391
R=iannucci@chromium.org,agable@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292117 0039d316-1c4b-4281-b951-d872f2087c98
2014-09-24 17:25:45 +00:00
pgervais@chromium.org
b9f2751b87 Added hyphen-only options
Some options have words separated by underscores. Added options with
same name and underscores replaced by hyphens.

BUG=400953

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@288366 0039d316-1c4b-4281-b951-d872f2087c98
2014-08-08 15:52:33 +00:00
iannucci@chromium.org
43f4ecc65e Make git rebase-update more responsive.
Passes through git-fetch's output instead of buffering it.

R=djacques@chromium.org
TBR=agable@chromium.org
BUG=366375

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@269080 0039d316-1c4b-4281-b951-d872f2087c98
2014-05-08 19:22:47 +00:00
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
2014-04-12 00:14:41 +00:00
iannucci@chromium.org
512d97d412 Remember what branches we delete and do not try to reparent them in cleanup.
R=agable@chromium.org
BUG=357367

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260704 0039d316-1c4b-4281-b951-d872f2087c98
2014-03-31 23:36:10 +00:00
iannucci@chromium.org
56a624ac56 Fix the print of the rebase error message, and make the output prettier too.
For some reason .output doesn't throw an AttributeError, but returns None ,
instead. .stdout is the correct attribute.

R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259695 0039d316-1c4b-4281-b951-d872f2087c98
2014-03-26 21:23:09 +00:00
iannucci@chromium.org
97231b5fb5 Fix bad interpreters.
Somehow some (but not all) git helper scripts got the wrong interpreter. This
fixes them to use /usr/bin/env.

TBR=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259522 0039d316-1c4b-4281-b951-d872f2087c98
2014-03-26 06:54:55 +00:00
iannucci@chromium.org
c050a5b2be Add a family of git-commands to assist with the management of multiple CLs/branches.
git-rebase-update - ensure all branches are up to date
git-new-branch - create branches
git-rename-branch - rename a branch while preserving parentage relationships
git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent.
git-squash-branch - collapse a branch into a single commit
git-upstream-diff - show the diff between the current branch and it's upstream branch
git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch.

R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org
BUG=261738

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
2014-03-26 06:18:50 +00:00