- 28 Aug, 2017 2 commits
-
-
Aaron Gable authored
R=lgarron@chromium.org Bug: 758435 Change-Id: I557cf5027636e8cf30d3971071723bf2b9333f9e Reviewed-on: https://chromium-review.googlesource.com/639036Reviewed-by:
Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org>
-
Aaron Gable authored
If one of the "branches" being shown by 'git map-branches' is the pseudo-branch "{NO_UPSTREAM}", and the user has asked the command to print the subject line of each branch, it would crash. This change causes it to gracefully handle that case. R=lgarron@chromium.org Bug: 758428 Change-Id: Id0ff1c6fd90b5efbb07e118ae088e3999c234b67 Reviewed-on: https://chromium-review.googlesource.com/639190Reviewed-by:
Robbie Iannucci <iannucci@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org>
-
- 20 Apr, 2017 1 commit
-
-
anatoly techtonik authored
Bug: Change-Id: Ie624d20ecff2afd274043620fbb2edcbcee857c6 Reviewed-on: https://chromium-review.googlesource.com/476670 Commit-Queue: anatoly techtonik <techtonik@gmail.com> Reviewed-by:
Robbie Iannucci <iannucci@chromium.org>
-
- 19 Jul, 2016 2 commits
-
-
techtonik authored
Traceback (most recent call last): ... File "...\\git_map_branches.py", line 303, in main mapper.start() File "...\\git_map_branches.py", line 169, in start self.__append_branch(root) File "...\\git_map_branches.py", line 272, in __append_branch self.__append_branch(child, depth=depth + 1) File "...\\git_map_branches.py", line 267, in __append_branch line.append(run('log', '-n1', '--format=%s', branch)) File "...\git_common.py", line 599, in run return run_with_stderr(*cmd, **kwargs)[0] File "...\git_common.py", line 668, in run_with_stderr raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), ret, err) subprocess2.CalledProcessError: Command '...\\git.bat -c color.ui=never log -n1 --format=%s readme' returned non-zero exit status 128 in ... fatal: ambiguous argument 'readme': both revision and filename Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' BUG= Review-Url: https://codereview.chromium.org/2153803002
-
asanka authored
git-map-branches -v -v -v currently indicates the status of the CL using a color. This change adds the status string alongside the CL to match the output of 'git-cl status'. $ git map-branches -v -v -v Before: A 354ccf6 [ ahead 1 ] https://codereview... B e701150 [ ahead 1 ] https://codereview... C * 094cedd [ ahead 1 ] https://codereview... After: A 354ccf6 [ ahead 1 ] https://codereview... (commit) B e701150 [ ahead 1 ] https://codereview... (lgtm) C * 094cedd [ ahead 1 ] https://codereview... (waiting) R=dpranke@chromium.org BUG=none Review-Url: https://codereview.chromium.org/2138703003
-
- 31 May, 2016 1 commit
-
-
clemensh@chromium.org authored
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=300132 Review-Url: https://codereview.chromium.org/1893563002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300673 0039d316-1c4b-4281-b951-d872f2087c98
-
- 04 Apr, 2016 1 commit
-
-
iannucci@chromium.org authored
'setup_color' now contains logic to correctly detect: * cmd * cmd pipe * msys bash * msys pipe * cmd running inside msys bash (git-command) * cmd pipe running inside msys bash (git-command > outfile) R=brucedawson@chromium.org, dnj@chromium.org BUG=600049 Review URL: https://codereview.chromium.org/1851283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299682 0039d316-1c4b-4281-b951-d872f2087c98
-
- 01 Apr, 2016 3 commits
-
-
iannucci@chromium.org authored
* `git bash` helper now will either: * launch an interactive bash prompt in the MinGW Terminal Emulator * launch a non-interactive bash shell if arguments are provided * `git bash` now includes python, python/Scripts and svn binaries in the PATH. * depot_tools' colorization now works in MinGW Terminal Emulator * batch scripts are now regenerated if any of them is missing. R=agable@chromium.org, dnj@chromium.org, mmoss@chromium.org BUG=598956 Review URL: https://codereview.chromium.org/1847783002 . git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299616 0039d316-1c4b-4281-b951-d872f2087c98
-
iannucci@chromium.org authored
This reverts commit eed06d62. Accidental dcommit git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299615 0039d316-1c4b-4281-b951-d872f2087c98
-
iannucci@chromium.org authored
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299614 0039d316-1c4b-4281-b951-d872f2087c98
-
- 24 Mar, 2016 1 commit
-
-
jsbell@google.com authored
Logic for highlighting "origin/master" (etc) just looked for "origin" as a prefix. Add the slash since "origin-foo" is a boring old valid topic branch name. R=iannucci@chromium.org, iannucci@google.com Review URL: https://codereview.chromium.org/1832973002 . git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299486 0039d316-1c4b-4281-b951-d872f2087c98
-
- 11 Jun, 2015 1 commit
-
-
sdefresne@chromium.org authored
CL https://codereview.chromium.org/1172223002 changed the meaning of the third value in the tuple returned by get_cl_statuses from a color to the status of the branch and broke the formatting of output. Convert the status to the color using color_for_status helper function. BUG=499189 Review URL: https://codereview.chromium.org/1175103004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295618 0039d316-1c4b-4281-b951-d872f2087c98
-
- 26 Mar, 2015 1 commit
-
-
borenet@google.com authored
BUG= Review URL: https://codereview.chromium.org/996643004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294578 0039d316-1c4b-4281-b951-d872f2087c98
-
- 12 Mar, 2015 1 commit
-
-
calamity@chromium.org authored
This CL makes git-map-branches show CL status colors like git cl status when -vvv is used. Statuses are fetched in parallel for speed. BUG=379849 Review URL: https://codereview.chromium.org/938583002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294414 0039d316-1c4b-4281-b951-d872f2087c98
-
- 26 Feb, 2015 1 commit
-
-
sbc@chromium.org authored
Handle KeyboardInterrupt gracefully rather the printing a backtrace. Most users of these tools don't expect a backtrace when then hit Ctrl-C. Also, fix a few other inconsistencies found in the python startup code of these different scripts: - always call main function 'main' (rather than 'Main') - always return 0 from main function - if main takes args never include argv[0] Review URL: https://codereview.chromium.org/955993006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294250 0039d316-1c4b-4281-b951-d872f2087c98
-
- 23 Sep, 2014 1 commit
-
-
calamity@chromium.org authored
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
-
- 08 Sep, 2014 2 commits
-
-
iannucci@chromium.org authored
improvements. * No longer crash on HEAD * Always correctly highlight lines based on hash-matching-ness * Only import git_cl if you want it (it can be slow) * Print a message when NO branches are found (instead of blank output) R=calamity@chromium.org, jsbell@chromium.org BUG=410353 Review URL: https://codereview.chromium.org/554523003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291847 0039d316-1c4b-4281-b951-d872f2087c98
-
calamity@chromium.org authored
This CL prevents map-branches from loading the tracking status when the -v flag is not supplied. This prevents the vanilla map-branches from taking a potentially long time to retrieve the tracking status. BUG=410137 Review URL: https://codereview.chromium.org/536793002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291846 0039d316-1c4b-4281-b951-d872f2087c98
-
- 03 Sep, 2014 1 commit
-
-
calamity@chromium.org authored
This CL adds information to the git map-branches command. Invoking it map-branches with -v, will show tracking status of branches and invoking with -vv will additionally show the Rietveld URL and the branch hash. BUG=None Review URL: https://codereview.chromium.org/509843002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291776 0039d316-1c4b-4281-b951-d872f2087c98
-
- 26 Mar, 2014 1 commit
-
-
iannucci@chromium.org authored
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
-
- 13 Mar, 2014 1 commit
-
-
iannucci@chromium.org authored
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
-
- 12 Mar, 2014 1 commit
-
-
iannucci@chromium.org authored
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
-