##// END OF EJS Templates
revert: change the direction of revert -i...
Laurent Charignon -
r25657:dcc56e10 default
parent child Browse files
Show More
@@ -3102,7 +3102,7 b' def _performrevert(repo, parents, ctx, a'
3102 diffopts.git = True
3102 diffopts.git = True
3103 reversehunks = repo.ui.configbool('experimental',
3103 reversehunks = repo.ui.configbool('experimental',
3104 'revertalternateinteractivemode',
3104 'revertalternateinteractivemode',
3105 False)
3105 True)
3106 if reversehunks:
3106 if reversehunks:
3107 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3107 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3108 else:
3108 else:
@@ -56,8 +56,8 b' 10 run the same test than 8 from within '
56 2 hunks, 2 lines changed
56 2 hunks, 2 lines changed
57 examine changes to 'f'? [Ynesfdaq?] y
57 examine changes to 'f'? [Ynesfdaq?] y
58
58
59 @@ -1,6 +1,5 @@
59 @@ -1,5 +1,6 @@
60 -a
60 +a
61 1
61 1
62 2
62 2
63 3
63 3
@@ -65,21 +65,21 b' 10 run the same test than 8 from within '
65 5
65 5
66 record change 1/6 to 'f'? [Ynesfdaq?] y
66 record change 1/6 to 'f'? [Ynesfdaq?] y
67
67
68 @@ -2,6 +1,5 @@
68 @@ -1,5 +2,6 @@
69 1
69 1
70 2
70 2
71 3
71 3
72 4
72 4
73 5
73 5
74 -b
74 +b
75 record change 2/6 to 'f'? [Ynesfdaq?] y
75 record change 2/6 to 'f'? [Ynesfdaq?] y
76
76
77 diff --git a/folder1/g b/folder1/g
77 diff --git a/folder1/g b/folder1/g
78 2 hunks, 2 lines changed
78 2 hunks, 2 lines changed
79 examine changes to 'folder1/g'? [Ynesfdaq?] y
79 examine changes to 'folder1/g'? [Ynesfdaq?] y
80
80
81 @@ -1,6 +1,5 @@
81 @@ -1,5 +1,6 @@
82 -c
82 +c
83 1
83 1
84 2
84 2
85 3
85 3
@@ -87,13 +87,13 b' 10 run the same test than 8 from within '
87 5
87 5
88 record change 3/6 to 'folder1/g'? [Ynesfdaq?] y
88 record change 3/6 to 'folder1/g'? [Ynesfdaq?] y
89
89
90 @@ -2,6 +1,5 @@
90 @@ -1,5 +2,6 @@
91 1
91 1
92 2
92 2
93 3
93 3
94 4
94 4
95 5
95 5
96 -d
96 +d
97 record change 4/6 to 'folder1/g'? [Ynesfdaq?] n
97 record change 4/6 to 'folder1/g'? [Ynesfdaq?] n
98
98
99 diff --git a/folder2/h b/folder2/h
99 diff --git a/folder2/h b/folder2/h
@@ -155,8 +155,8 b' Test that --interactive lift the need fo'
155 2 hunks, 2 lines changed
155 2 hunks, 2 lines changed
156 examine changes to 'f'? [Ynesfdaq?] y
156 examine changes to 'f'? [Ynesfdaq?] y
157
157
158 @@ -1,6 +1,5 @@
158 @@ -1,5 +1,6 @@
159 -a
159 +a
160 1
160 1
161 2
161 2
162 3
162 3
@@ -164,21 +164,21 b' Test that --interactive lift the need fo'
164 5
164 5
165 record change 1/6 to 'f'? [Ynesfdaq?] y
165 record change 1/6 to 'f'? [Ynesfdaq?] y
166
166
167 @@ -2,6 +1,5 @@
167 @@ -1,5 +2,6 @@
168 1
168 1
169 2
169 2
170 3
170 3
171 4
171 4
172 5
172 5
173 -b
173 +b
174 record change 2/6 to 'f'? [Ynesfdaq?] y
174 record change 2/6 to 'f'? [Ynesfdaq?] y
175
175
176 diff --git a/folder1/g b/folder1/g
176 diff --git a/folder1/g b/folder1/g
177 2 hunks, 2 lines changed
177 2 hunks, 2 lines changed
178 examine changes to 'folder1/g'? [Ynesfdaq?] y
178 examine changes to 'folder1/g'? [Ynesfdaq?] y
179
179
180 @@ -1,6 +1,5 @@
180 @@ -1,5 +1,6 @@
181 -c
181 +c
182 1
182 1
183 2
183 2
184 3
184 3
@@ -186,13 +186,13 b' Test that --interactive lift the need fo'
186 5
186 5
187 record change 3/6 to 'folder1/g'? [Ynesfdaq?] y
187 record change 3/6 to 'folder1/g'? [Ynesfdaq?] y
188
188
189 @@ -2,6 +1,5 @@
189 @@ -1,5 +2,6 @@
190 1
190 1
191 2
191 2
192 3
192 3
193 4
193 4
194 5
194 5
195 -d
195 +d
196 record change 4/6 to 'folder1/g'? [Ynesfdaq?] n
196 record change 4/6 to 'folder1/g'? [Ynesfdaq?] n
197
197
198 diff --git a/folder2/h b/folder2/h
198 diff --git a/folder2/h b/folder2/h
@@ -234,8 +234,8 b' Test that --interactive lift the need fo'
234 2 hunks, 2 lines changed
234 2 hunks, 2 lines changed
235 examine changes to 'f'? [Ynesfdaq?] y
235 examine changes to 'f'? [Ynesfdaq?] y
236
236
237 @@ -1,5 +1,6 @@
237 @@ -1,6 +1,5 @@
238 +a
238 -a
239 1
239 1
240 2
240 2
241 3
241 3
@@ -243,13 +243,13 b' Test that --interactive lift the need fo'
243 5
243 5
244 record change 1/2 to 'f'? [Ynesfdaq?] y
244 record change 1/2 to 'f'? [Ynesfdaq?] y
245
245
246 @@ -1,5 +2,6 @@
246 @@ -2,6 +1,5 @@
247 1
247 1
248 2
248 2
249 3
249 3
250 4
250 4
251 5
251 5
252 +b
252 -b
253 record change 2/2 to 'f'? [Ynesfdaq?] n
253 record change 2/2 to 'f'? [Ynesfdaq?] n
254
254
255 $ hg st
255 $ hg st
@@ -298,10 +298,10 b' 3) Use interactive revert with editing ('
298 1 hunks, 2 lines changed
298 1 hunks, 2 lines changed
299 examine changes to 'k'? [Ynesfdaq?] y
299 examine changes to 'k'? [Ynesfdaq?] y
300
300
301 @@ -1,2 +1,1 @@
301 @@ -1,1 +1,2 @@
302 -0
302 -1
303 -2
303 +0
304 +1
304 +2
305 record this change to 'k'? [Ynesfdaq?] e
305 record this change to 'k'? [Ynesfdaq?] e
306
306
307 $ cat k
307 $ cat k
@@ -310,7 +310,7 b' 3) Use interactive revert with editing ('
310 Check the experimental config to invert the selection:
310 Check the experimental config to invert the selection:
311 $ cat <<EOF >> $HGRCPATH
311 $ cat <<EOF >> $HGRCPATH
312 > [experimental]
312 > [experimental]
313 > revertalternateinteractivemode=True
313 > revertalternateinteractivemode=False
314 > EOF
314 > EOF
315
315
316
316
@@ -343,29 +343,29 b' Check the experimental config to invert '
343 3 hunks, 3 lines changed
343 3 hunks, 3 lines changed
344 examine changes to 'folder1/g'? [Ynesfdaq?] y
344 examine changes to 'folder1/g'? [Ynesfdaq?] y
345
345
346 @@ -1,4 +1,5 @@
346 @@ -1,5 +1,4 @@
347 +firstline
347 -firstline
348 c
348 c
349 1
349 1
350 2
350 2
351 3
351 3
352 record change 1/3 to 'folder1/g'? [Ynesfdaq?] y
352 record change 1/3 to 'folder1/g'? [Ynesfdaq?] y
353
353
354 @@ -1,7 +2,7 @@
354 @@ -2,7 +1,7 @@
355 c
355 c
356 1
356 1
357 2
357 2
358 3
358 3
359 -4
359 - 3
360 + 3
360 +4
361 5
361 5
362 d
362 d
363 record change 2/3 to 'folder1/g'? [Ynesfdaq?] y
363 record change 2/3 to 'folder1/g'? [Ynesfdaq?] y
364
364
365 @@ -6,2 +7,3 @@
365 @@ -7,3 +6,2 @@
366 5
366 5
367 d
367 d
368 +lastline
368 -lastline
369 record change 3/3 to 'folder1/g'? [Ynesfdaq?] n
369 record change 3/3 to 'folder1/g'? [Ynesfdaq?] n
370
370
371 $ hg diff --nodates
371 $ hg diff --nodates
General Comments 0
You need to be logged in to leave comments. Login now