third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py - Issue 2590693002: Only add unstaged baseline changes to the git index when rebaselining.

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: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

Issue 2590693002: Only add unstaged baseline changes to the git index when rebaselining. (Closed)

Patch Set: rebaseline-cl: Abort if there are unstaged baseline changes. Created 4 years 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_mock.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

index 620a8d29e5ba7d9ab86a7e14c0ae4a3e75b1b120..000aa153cf829af703961176ae0b267f65c7c92f 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

@@ -252,3 +252,23 @@ class GitTestWithMock(SCMTestBase):

scm._run_git = lambda args: 'Date: 2013-02-08 01:55:21 -0800'

self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-02-08T09:55:21Z')

+ def test_unstaged_files(self):

+ scm = self.make_scm()

+ status_lines = [

+ ' M d/modified.txt',

+ ' D d/deleted.txt',

+ '?? d/untracked.txt',

+ 'D d/deleted.txt',

+ 'M d/modified-staged.txt',

+ 'A d/added-staged.txt',

+ ]

+ # pylint: disable=protected-access

+ scm._run_git = lambda args: '\x00'.join(status_lines) + '\x00'

+ self.assertEqual(

+ scm.unstaged_changes(),

+ {

+ 'd/modified.txt': 'M',

+ 'd/deleted.txt': 'D',

+ 'd/untracked.txt': '?',

+ })