gclient_scm.py - Issue 756223002: Change git-rebase-update to always keep branch 'master'.

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: gclient_scm.py

Issue 756223002: Change git-rebase-update to always keep branch 'master'. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 1 month 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: gclient_scm.py

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

index 95c142f93c8954fab67b72a2e623dedc986824de..e42f6716387fb720a263392290191d9ea7f56456 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -298,7 +298,7 @@ class GitWrapper(SCMWrapper):

gclient_utils.CheckCallAndFilter(

['git', 'diff', merge_base],

cwd=self.checkout_path,

- filter_fn=GitDiffFilterer(self.relpath).Filter, print_func=self.Print)

+ filter_fn=GitDiffFilterer(self.relpath, print_func=self.Print).Filter)

M-A Ruel 2014/11/25 20:38:31 I can only assume this code path is not used. Pro

def _FetchAndReset(self, revision, file_list, options):

"""Equivalent to git fetch; git reset."""

@@ -1188,7 +1188,7 @@ class SVNWrapper(SCMWrapper):

['svn', 'diff', '-x', '--ignore-eol-style'] + args,

cwd=self.checkout_path,

print_stdout=False,

- filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)

+ filter_fn=SvnDiffFilterer(self.relpath, print_func=self.Print).Filter)

def update(self, options, args, file_list):

"""Runs svn to update or transparently checkout the working copy.

« no previous file with comments | « fix_encoding.py ('k') | git_rebase_update.py » ('j') | tests/git_rebase_update_test.py » ('J')