tests/git_cl_test.py - Issue 10537117: Add support for new repo topology, with submodule-specific merge commits

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: tests/git_cl_test.py

Issue 10537117: Add support for new repo topology, with submodule-specific merge commits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/

Patch Set: Created 8 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: tests/git_cl_test.py

===================================================================

--- tests/git_cl_test.py (revision 141621)

+++ tests/git_cl_test.py (working copy)

@@ -146,6 +146,9 @@

((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),

((['git', 'config', 'branch.working.merge'],), 'refs/heads/master'),

((['git', 'config', 'branch.working.remote'],), 'origin'),

+ ((['git', 'rev-list', '--merges',

+ '--grep="^SVN changes up to revision [0-9]*$"',

+ 'refs/remotes/origin/master^!'],), ''),

((['git', 'update-index', '--refresh', '-q'],), ''),

((['git', 'diff-index', 'HEAD'],), ''),

((['git', 'rev-list', '^refs/heads/working',

@@ -197,6 +200,8 @@

'refs/heads/git-cl-commit'],),

(('', None), 0)),

((['git', 'branch', '-D', 'git-cl-commit'],), ''),

+ ((['git', 'show-ref', '--quiet', '--verify',

+ 'refs/heads/git-cl-cherry-pick'],), ''),

((['git', 'rev-parse', '--show-cdup'],), '\n'),

((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),

((['git', 'reset', '--soft', 'refs/remotes/origin/master'],), ''),

« no previous file with comments | « git_cl.py ('k') | no next file » | no next file with comments »