Commit Graph

7 Commits (c137c1a5a6e3f0f23f2f7d71cc827c6930feb839)

Author SHA1 Message Date
iannucci@chromium.org 10fbe879aa Make marked merge base invalid when the upstream changes.
This should let the base marker transparently work with plain-old-git tools
which was the idea in the first place. Specifically `git branch -u` without a
corresponding rebase.

R=agable@chromium.org
BUG=373977

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@271112 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 6332b152c6 Make git_map properly update merge base markers.
R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@270572 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org cfa516f8a3 Fix colorization bug in git_map.
Previously BRIGHT+WHITE would wrap around to the asterisk on the next line.

R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261783 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org a8378e2fdb Explicitly include root() in the git-map call to git-log.
This is in-place of --remotes. With repos like src.git that have alternate roots
this causes git-map to be faster (since it's not trying to display
origin/master).

R=agable@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259646 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
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
11 years ago
iannucci@chromium.org a112f03fcf Fix git_nav_downstream.py when origin/master is checked out.
Also fix missing copyright notices.

R=agable@chromium.org
BUG=261738

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256777 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 8bc9b5c101 Add git-map and git-map-branches to depot_tools.
git-map: Show your local repo's history in a pseudo-graphical format from the command line.

git-map-branches: Show the topology of all of your branches, and their upstream relationships.

git-nav-upstream: Navigate (checkout) to the upstream branch of the current branch.

git-nav-downstream: Navigate (checkout) to a downstream branch of the current branch. If there's more than one downstream branch, then present a menu to select which one you want.

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

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

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