Show More
@@ -116,6 +116,7 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
116 | diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) |
|
116 | diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) | |
117 | diffopts.nodates = True |
|
117 | diffopts.nodates = True | |
118 | diffopts.git = True |
|
118 | diffopts.git = True | |
|
119 | diffopts.showfunc = True | |||
119 | originaldiff = patch.diff(repo, changes=status, opts=diffopts) |
|
120 | originaldiff = patch.diff(repo, changes=status, opts=diffopts) | |
120 | originalchunks = patch.parsepatch(originaldiff) |
|
121 | originalchunks = patch.parsepatch(originaldiff) | |
121 |
|
122 |
@@ -318,7 +318,7 b' Modify end of plain file, no EOL' | |||||
318 | 1 hunks, 1 lines changed |
|
318 | 1 hunks, 1 lines changed | |
319 | examine changes to 'plain'? [Ynesfdaq?] y |
|
319 | examine changes to 'plain'? [Ynesfdaq?] y | |
320 |
|
320 | |||
321 | @@ -9,3 +9,4 @@ |
|
321 | @@ -9,3 +9,4 @@ 8 | |
322 | 9 |
|
322 | 9 | |
323 | 10 |
|
323 | 10 | |
324 | 11 |
|
324 | 11 | |
@@ -342,7 +342,7 b' Modify end of plain file, add EOL' | |||||
342 | 1 hunks, 1 lines changed |
|
342 | 1 hunks, 1 lines changed | |
343 | examine changes to 'plain'? [Ynesfdaq?] y |
|
343 | examine changes to 'plain'? [Ynesfdaq?] y | |
344 |
|
344 | |||
345 | @@ -9,4 +9,4 @@ |
|
345 | @@ -9,4 +9,4 @@ 8 | |
346 | 9 |
|
346 | 9 | |
347 | 10 |
|
347 | 10 | |
348 | 11 |
|
348 | 11 | |
@@ -387,7 +387,7 b' changes numbering' | |||||
387 | 4 |
|
387 | 4 | |
388 | record change 1/3 to 'plain'? [Ynesfdaq?] y |
|
388 | record change 1/3 to 'plain'? [Ynesfdaq?] y | |
389 |
|
389 | |||
390 | @@ -8,5 +8,3 @@ |
|
390 | @@ -8,5 +8,3 @@ 7 | |
391 | 8 |
|
391 | 8 | |
392 | 9 |
|
392 | 9 | |
393 | 10 |
|
393 | 10 | |
@@ -656,7 +656,7 b' Record end' | |||||
656 | 1 hunks, 2 lines changed |
|
656 | 1 hunks, 2 lines changed | |
657 | examine changes to 'plain'? [Ynesfdaq?] y |
|
657 | examine changes to 'plain'? [Ynesfdaq?] y | |
658 |
|
658 | |||
659 | @@ -9,3 +9,5 @@ |
|
659 | @@ -9,3 +9,5 @@ 6 | |
660 | 7 |
|
660 | 7 | |
661 | 8 |
|
661 | 8 | |
662 | 9 |
|
662 | 9 | |
@@ -946,7 +946,7 b' Preserve chmod -x' | |||||
946 | 1 hunks, 1 lines changed |
|
946 | 1 hunks, 1 lines changed | |
947 | examine changes to 'subdir/f1'? [Ynesfdaq?] y |
|
947 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
948 |
|
948 | |||
949 | @@ -2,3 +2,4 @@ |
|
949 | @@ -2,3 +2,4 @@ a | |
950 | a |
|
950 | a | |
951 | a |
|
951 | a | |
952 | b |
|
952 | b | |
@@ -1379,7 +1379,7 b' Ignore win32text deprecation warning for' | |||||
1379 | 1 hunks, 1 lines changed |
|
1379 | 1 hunks, 1 lines changed | |
1380 | examine changes to 'subdir/f1'? [Ynesfdaq?] y |
|
1380 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
1381 |
|
1381 | |||
1382 | @@ -3,3 +3,4 @@ |
|
1382 | @@ -3,3 +3,4 @@ a | |
1383 | a |
|
1383 | a | |
1384 | b |
|
1384 | b | |
1385 | c |
|
1385 | c | |
@@ -1418,7 +1418,7 b' Test --user when ui.username not set' | |||||
1418 | 1 hunks, 1 lines changed |
|
1418 | 1 hunks, 1 lines changed | |
1419 | examine changes to 'subdir/f1'? [Ynesfdaq?] y |
|
1419 | examine changes to 'subdir/f1'? [Ynesfdaq?] y | |
1420 |
|
1420 | |||
1421 | @@ -4,3 +4,4 @@ |
|
1421 | @@ -4,3 +4,4 @@ a | |
1422 | b |
|
1422 | b | |
1423 | c |
|
1423 | c | |
1424 | d |
|
1424 | d | |
@@ -1449,7 +1449,7 b' Moving files' | |||||
1449 | 1 hunks, 1 lines changed |
|
1449 | 1 hunks, 1 lines changed | |
1450 | examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y |
|
1450 | examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y | |
1451 |
|
1451 | |||
1452 | @@ -11,3 +11,4 @@ |
|
1452 | @@ -11,3 +11,4 @@ 8 | |
1453 | 9 |
|
1453 | 9 | |
1454 | 10 |
|
1454 | 10 | |
1455 | 11 |
|
1455 | 11 |
@@ -91,7 +91,7 b' record' | |||||
91 | 1 hunks, 1 lines changed |
|
91 | 1 hunks, 1 lines changed | |
92 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) |
|
92 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | |
93 |
|
93 | |||
94 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
94 | \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc) | |
95 | c |
|
95 | c | |
96 | a |
|
96 | a | |
97 | a |
|
97 | a | |
@@ -121,7 +121,7 b' qrecord' | |||||
121 | 1 hunks, 1 lines changed |
|
121 | 1 hunks, 1 lines changed | |
122 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) |
|
122 | \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc) | |
123 |
|
123 | |||
124 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) |
|
124 | \x1b[0;35m@@ -2,7 +2,7 @@ c\x1b[0m (esc) | |
125 | c |
|
125 | c | |
126 | a |
|
126 | a | |
127 | a |
|
127 | a |
General Comments 0
You need to be logged in to leave comments.
Login now