git_common.py - Issue 2019223002: Stashing is also an option when copy is dirty for upload

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_common.py

Issue 2019223002: Stashing is also an option when copy is dirty for upload (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Freeze is a better stash Created 4 years, 5 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_common.py

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

index 9ccbbc35a6344adc5cd85abf3dc09d02219c82c2..289665e24cd1184967d5159f92ae0db582d4d025 100644

--- a/git_common.py

+++ b/git_common.py

@@ -750,7 +750,8 @@ def get_dirty_files():

def is_dirty_git_tree(cmd):

dirty = get_dirty_files()

if dirty:

- print 'Cannot %s with a dirty tree. You must commit locally first.' % cmd

+ print 'Cannot %s with a dirty tree. '\

+ 'Commit, freeze or stash your changes first.' % cmd

print 'Uncommitted files: (git diff-index --name-status HEAD)'

print dirty[:4096]

if len(dirty) > 4096: # pragma: no cover

« no previous file with comments | « no previous file | no next file » | no next file with comments »