Show More
@@ -3127,7 +3127,10 b' def _performrevert(repo, parents, ctx, a' | |||
|
3127 | 3127 | # Prompt the user for changes to revert |
|
3128 | 3128 | torevert = [repo.wjoin(f) for f in actions['revert'][0]] |
|
3129 | 3129 | m = scmutil.match(ctx, torevert, {}) |
|
3130 |
diff = patch.diff(repo, |
|
|
3130 | diffopts = patch.difffeatureopts(repo.ui, whitespace=True) | |
|
3131 | diffopts.nodates = True | |
|
3132 | diffopts.git = True | |
|
3133 | diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts) | |
|
3131 | 3134 | originalchunks = patch.parsepatch(diff) |
|
3132 | 3135 | try: |
|
3133 | 3136 | chunks = recordfilter(repo.ui, originalchunks) |
@@ -52,7 +52,7 b' 10 run the same test than 8 from within ' | |||
|
52 | 52 | reverting folder1/g (glob) |
|
53 | 53 | removing folder1/i (glob) |
|
54 | 54 | reverting folder2/h (glob) |
|
55 | diff -r 89ac3d72e4a4 f | |
|
55 | diff --git a/f b/f | |
|
56 | 56 | 2 hunks, 2 lines changed |
|
57 | 57 | examine changes to 'f'? [Ynesfdaq?] y |
|
58 | 58 | |
@@ -74,7 +74,7 b' 10 run the same test than 8 from within ' | |||
|
74 | 74 | -b |
|
75 | 75 | record change 2/6 to 'f'? [Ynesfdaq?] y |
|
76 | 76 | |
|
77 | diff -r 89ac3d72e4a4 folder1/g | |
|
77 | diff --git a/folder1/g b/folder1/g | |
|
78 | 78 | 2 hunks, 2 lines changed |
|
79 | 79 | examine changes to 'folder1/g'? [Ynesfdaq?] y |
|
80 | 80 | |
@@ -96,7 +96,7 b' 10 run the same test than 8 from within ' | |||
|
96 | 96 | -d |
|
97 | 97 | record change 4/6 to 'folder1/g'? [Ynesfdaq?] n |
|
98 | 98 | |
|
99 | diff -r 89ac3d72e4a4 folder2/h | |
|
99 | diff --git a/folder2/h b/folder2/h | |
|
100 | 100 | 2 hunks, 2 lines changed |
|
101 | 101 | examine changes to 'folder2/h'? [Ynesfdaq?] n |
|
102 | 102 | |
@@ -127,7 +127,7 b' Test that --interactive lift the need fo' | |||
|
127 | 127 | $ echo q | hg revert -i -r 2 |
|
128 | 128 | reverting folder1/g (glob) |
|
129 | 129 | reverting folder2/h (glob) |
|
130 | diff -r 89ac3d72e4a4 folder1/g | |
|
130 | diff --git a/folder1/g b/folder1/g | |
|
131 | 131 | 1 hunks, 1 lines changed |
|
132 | 132 | examine changes to 'folder1/g'? [Ynesfdaq?] q |
|
133 | 133 | |
@@ -151,7 +151,7 b' Test that --interactive lift the need fo' | |||
|
151 | 151 | reverting folder1/g (glob) |
|
152 | 152 | removing folder1/i (glob) |
|
153 | 153 | reverting folder2/h (glob) |
|
154 | diff -r 89ac3d72e4a4 f | |
|
154 | diff --git a/f b/f | |
|
155 | 155 | 2 hunks, 2 lines changed |
|
156 | 156 | examine changes to 'f'? [Ynesfdaq?] y |
|
157 | 157 | |
@@ -173,7 +173,7 b' Test that --interactive lift the need fo' | |||
|
173 | 173 | -b |
|
174 | 174 | record change 2/6 to 'f'? [Ynesfdaq?] y |
|
175 | 175 | |
|
176 | diff -r 89ac3d72e4a4 folder1/g | |
|
176 | diff --git a/folder1/g b/folder1/g | |
|
177 | 177 | 2 hunks, 2 lines changed |
|
178 | 178 | examine changes to 'folder1/g'? [Ynesfdaq?] y |
|
179 | 179 | |
@@ -195,7 +195,7 b' Test that --interactive lift the need fo' | |||
|
195 | 195 | -d |
|
196 | 196 | record change 4/6 to 'folder1/g'? [Ynesfdaq?] n |
|
197 | 197 | |
|
198 | diff -r 89ac3d72e4a4 folder2/h | |
|
198 | diff --git a/folder2/h b/folder2/h | |
|
199 | 199 | 2 hunks, 2 lines changed |
|
200 | 200 | examine changes to 'folder2/h'? [Ynesfdaq?] n |
|
201 | 201 | |
@@ -230,7 +230,7 b' Test that --interactive lift the need fo' | |||
|
230 | 230 | > n |
|
231 | 231 | > n |
|
232 | 232 | > EOF |
|
233 | diff -r 59dd6e4ab63a f | |
|
233 | diff --git a/f b/f | |
|
234 | 234 | 2 hunks, 2 lines changed |
|
235 | 235 | examine changes to 'f'? [Ynesfdaq?] y |
|
236 | 236 |
General Comments 0
You need to be logged in to leave comments.
Login now