git_map.py - Issue 2052113002: Make git-freeze bail out if the user has too much untracked data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_map.py

Issue 2052113002: Make git-freeze bail out if the user has too much untracked data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: git_map.py

diff --git a/git_map.py b/git_map.py

index 99c8b05c7513344da8361d710a68bf53ae420455..a6442c8817bffa7fc563f0c156251f78faf5886a 100755

--- a/git_map.py

+++ b/git_map.py

@@ -18,7 +18,7 @@ import sys

import subprocess2

-from git_common import current_branch, branches, tags, config_list, GIT_EXE

+from git_common import current_branch, branches, tags, get_config_list, GIT_EXE

from git_common import get_or_create_merge_base, root

from third_party import colorama

@@ -37,8 +37,8 @@ RESET = colorama.Fore.RESET + colorama.Back.RESET + colorama.Style.RESET_ALL

# Git emits combined color

BRIGHT_RED = '\x1b[1;31m'

-def main(argv):

- map_extra = config_list('depot_tools.map_extra')

+def main():

+ map_extra = get_config_list('depot_tools.map_extra')

fmt = '%C(red bold)%h%x09%Creset%C(green)%d%Creset %C(yellow)%ad%Creset ~ %s'

log_proc = subprocess2.Popen(

[GIT_EXE, 'log', '--graph', '--branches', '--tags', root(),

« git_common.py ('K') | « git_common.py ('k') | git_upstream_diff.py » ('j') | no next file with comments »