test-revert-interactive.t 7.92 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
Revert interactive tests
1 add and commit file f
2 add commit file folder1/g
3 add and commit file folder2/h
4 add and commit file folder1/i
5 commit change to file f
6 commit changes to files folder1/g folder2/h
7 commit changes to files folder1/g folder2/h
8 revert interactive to commit id 2 (line 3 above), check that folder1/i is removed and
9 make workdir match 7
10 run the same test than 8 from within folder1 and check same expectations

  $ cat <<EOF >> $HGRCPATH
  > [ui]
  > interactive = true
  > [extensions]
  > record =
18
  > purge = 
19 20 21
  > EOF


22
  $ mkdir -p a/folder1 a/folder2
23 24
  $ cd a
  $ hg init
25 26
  >>> open('f', 'wb').write("1\n2\n3\n4\n5\n")
  $ hg add f ; hg commit -m "adding f"
27 28 29
  $ cat f > folder1/g ; hg add folder1/g ; hg commit -m "adding folder1/g"
  $ cat f > folder2/h ; hg add folder2/h ; hg commit -m "adding folder2/h"
  $ cat f > folder1/i ; hg add folder1/i ; hg commit -m "adding folder1/i"
30 31 32 33 34 35
  >>> open('f', 'wb').write("a\n1\n2\n3\n4\n5\nb\n")
  $ hg commit -m "modifying f"
  >>> open('folder1/g', 'wb').write("c\n1\n2\n3\n4\n5\nd\n")
  $ hg commit -m "modifying folder1/g"
  >>> open('folder2/h', 'wb').write("e\n1\n2\n3\n4\n5\nf\n")
  $ hg commit -m "modifying folder2/h"
36 37 38 39 40 41 42 43 44 45 46 47 48
  $ hg tip
  changeset:   6:59dd6e4ab63a
  tag:         tip
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     modifying folder2/h
  
  $ hg revert -i -r 2 --all -- << EOF
  > y
  > y
  > y
  > y
  > y
49
  > ?
50
  > y
51 52 53 54 55 56 57
  > n
  > n
  > EOF
  reverting f
  reverting folder1/g (glob)
  removing folder1/i (glob)
  reverting folder2/h (glob)
58
  remove added file folder1/i (Yn)? y
59
  diff --git a/f b/f
60 61 62
  2 hunks, 2 lines changed
  examine changes to 'f'? [Ynesfdaq?] y
  
63 64
  @@ -1,5 +1,6 @@
  +a
65 66 67 68 69
   1
   2
   3
   4
   5
70
  revert change 1/6 to 'f'? [Ynesfdaq?] y
71
  
72
  @@ -1,5 +2,6 @@
73 74 75 76 77
   1
   2
   3
   4
   5
78
  +b
79
  revert change 2/6 to 'f'? [Ynesfdaq?] y
80
  
81
  diff --git a/folder1/g b/folder1/g
82 83 84
  2 hunks, 2 lines changed
  examine changes to 'folder1/g'? [Ynesfdaq?] y
  
85 86
  @@ -1,5 +1,6 @@
  +c
87 88 89 90 91
   1
   2
   3
   4
   5
92 93 94 95 96 97 98 99 100 101 102
  revert change 3/6 to 'folder1/g'? [Ynesfdaq?] ?
  
  y - yes, revert this change
  n - no, skip this change
  e - edit this change manually
  s - skip remaining changes to this file
  f - revert remaining changes to this file
  d - done, skip remaining changes and files
  a - revert all changes to all remaining files
  q - quit, reverting no changes
  ? - ? (display help)
103
  revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y
104
  
105
  @@ -1,5 +2,6 @@
106 107 108 109 110
   1
   2
   3
   4
   5
111
  +d
112
  revert change 4/6 to 'folder1/g'? [Ynesfdaq?] n
113
  
114
  diff --git a/folder2/h b/folder2/h
115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
  2 hunks, 2 lines changed
  examine changes to 'folder2/h'? [Ynesfdaq?] n
  
  $ cat f
  1
  2
  3
  4
  5
  $ cat folder1/g
  1
  2
  3
  4
  5
  d
  $ cat folder2/h
  e
  1
  2
  3
  4
  5
  f
139 140 141 142 143 144

Test that --interactive lift the need for --all

  $ echo q | hg revert -i -r 2
  reverting folder1/g (glob)
  reverting folder2/h (glob)
145
  diff --git a/folder1/g b/folder1/g
146 147 148 149 150
  1 hunks, 1 lines changed
  examine changes to 'folder1/g'? [Ynesfdaq?] q
  
  abort: user quit
  [255]
151 152 153
  $ ls folder1/
  g

154
Test that a noop revert doesn't do an unnecessary backup
155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
  $ (echo y; echo n) | hg revert -i -r 2 folder1/g
  diff --git a/folder1/g b/folder1/g
  1 hunks, 1 lines changed
  examine changes to 'folder1/g'? [Ynesfdaq?] y
  
  @@ -3,3 +3,4 @@
   3
   4
   5
  +d
  revert this change to 'folder1/g'? [Ynesfdaq?] n
  
  $ ls folder1/
  g

Test --no-backup
  $ (echo y; echo y) | hg revert -i -C -r 2 folder1/g
  diff --git a/folder1/g b/folder1/g
  1 hunks, 1 lines changed
  examine changes to 'folder1/g'? [Ynesfdaq?] y
  
  @@ -3,3 +3,4 @@
   3
   4
   5
  +d
  revert this change to 'folder1/g'? [Ynesfdaq?] y
  
  $ ls folder1/
  g
  >>> open('folder1/g', 'wb').write("1\n2\n3\n4\n5\nd\n")
186 187


188 189 190
  $ hg update -C 6
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg revert -i -r 2 --all -- << EOF
191
  > n
192 193 194 195 196 197 198 199 200 201 202 203
  > y
  > y
  > y
  > y
  > y
  > n
  > n
  > EOF
  reverting f
  reverting folder1/g (glob)
  removing folder1/i (glob)
  reverting folder2/h (glob)
204
  remove added file folder1/i (Yn)? n
205
  diff --git a/f b/f
206 207 208
  2 hunks, 2 lines changed
  examine changes to 'f'? [Ynesfdaq?] y
  
209 210
  @@ -1,5 +1,6 @@
  +a
211 212 213 214 215
   1
   2
   3
   4
   5
216
  revert change 1/6 to 'f'? [Ynesfdaq?] y
217
  
218
  @@ -1,5 +2,6 @@
219 220 221 222 223
   1
   2
   3
   4
   5
224
  +b
225
  revert change 2/6 to 'f'? [Ynesfdaq?] y
226
  
227
  diff --git a/folder1/g b/folder1/g
228 229 230
  2 hunks, 2 lines changed
  examine changes to 'folder1/g'? [Ynesfdaq?] y
  
231 232
  @@ -1,5 +1,6 @@
  +c
233 234 235 236 237
   1
   2
   3
   4
   5
238
  revert change 3/6 to 'folder1/g'? [Ynesfdaq?] y
239
  
240
  @@ -1,5 +2,6 @@
241 242 243 244 245
   1
   2
   3
   4
   5
246
  +d
247
  revert change 4/6 to 'folder1/g'? [Ynesfdaq?] n
248
  
249
  diff --git a/folder2/h b/folder2/h
250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273
  2 hunks, 2 lines changed
  examine changes to 'folder2/h'? [Ynesfdaq?] n
  
  $ cat f
  1
  2
  3
  4
  5
  $ cat folder1/g
  1
  2
  3
  4
  5
  d
  $ cat folder2/h
  e
  1
  2
  3
  4
  5
  f
274 275 276 277 278
  $ hg st
  M f
  M folder1/g
  $ hg revert --interactive f << EOF
  > y
279
  > ?
280 281 282 283
  > y
  > n
  > n
  > EOF
284
  diff --git a/f b/f
285 286 287
  2 hunks, 2 lines changed
  examine changes to 'f'? [Ynesfdaq?] y
  
288 289
  @@ -1,6 +1,5 @@
  -a
290 291 292 293 294
   1
   2
   3
   4
   5
295 296 297 298 299 300 301 302 303 304 305
  discard change 1/2 to 'f'? [Ynesfdaq?] ?
  
  y - yes, discard this change
  n - no, skip this change
  e - edit this change manually
  s - skip remaining changes to this file
  f - discard remaining changes to this file
  d - done, skip remaining changes and files
  a - discard all changes to all remaining files
  q - quit, discarding no changes
  ? - ? (display help)
306
  discard change 1/2 to 'f'? [Ynesfdaq?] y
307
  
308
  @@ -2,6 +1,5 @@
309 310 311 312 313
   1
   2
   3
   4
   5
314
  -b
315
  discard change 2/2 to 'f'? [Ynesfdaq?] n
316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333
  
  $ hg st
  M f
  M folder1/g
  ? f.orig
  $ cat f
  a
  1
  2
  3
  4
  5
  $ cat f.orig
  1
  2
  3
  4
  5
334 335
  $ rm f.orig
  $ hg update -C .
336
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
337 338 339 340 341 342 343 344 345

Check editing files newly added by a revert

1) Create a dummy editor changing 1 to 42
  $ cat > $TESTTMP/editor.sh << '__EOF__'
  > cat "$1"  | sed "s/1/42/g"  > tt
  > mv tt  "$1"
  > __EOF__

346 347 348
2) Add k
  $ printf "1\n" > k
  $ hg add k
349 350
  $ hg commit -m "add k"

351 352 353
3) Use interactive revert with editing (replacing +1 with +42):
  $ printf "0\n2\n" > k
  $ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i  <<EOF
354 355 356
  > y
  > e
  > EOF
357 358 359 360
  reverting k
  diff --git a/k b/k
  1 hunks, 2 lines changed
  examine changes to 'k'? [Ynesfdaq?] y
361
  
362 363 364 365
  @@ -1,1 +1,2 @@
  -1
  +0
  +2
366
  discard this change to 'k'? [Ynesfdaq?] e
367
  
368
  $ cat k
369
  42
370 371 372 373

Check the experimental config to invert the selection:
  $ cat <<EOF >> $HGRCPATH
  > [experimental]
374
  > revertalternateinteractivemode=False
375 376 377 378 379 380 381
  > EOF


  $ hg up -C .
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ printf 'firstline\nc\n1\n2\n3\n 3\n5\nd\nlastline\n' > folder1/g
  $ hg diff --nodates
382
  diff -r a3d963a027aa folder1/g
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406
  --- a/folder1/g
  +++ b/folder1/g
  @@ -1,7 +1,9 @@
  +firstline
   c
   1
   2
   3
  -4
  + 3
   5
   d
  +lastline
  $ hg revert -i <<EOF
  > y
  > y
  > y
  > n
  > EOF
  reverting folder1/g (glob)
  diff --git a/folder1/g b/folder1/g
  3 hunks, 3 lines changed
  examine changes to 'folder1/g'? [Ynesfdaq?] y
  
407 408
  @@ -1,4 +1,5 @@
  +firstline
409 410 411 412
   c
   1
   2
   3
413
  discard change 1/3 to 'folder1/g'? [Ynesfdaq?] y
414
  
415
  @@ -1,7 +2,7 @@
416 417 418 419
   c
   1
   2
   3
420 421
  -4
  + 3
422 423
   5
   d
424
  discard change 2/3 to 'folder1/g'? [Ynesfdaq?] y
425
  
426
  @@ -6,2 +7,3 @@
427 428
   5
   d
429
  +lastline
430
  discard change 3/3 to 'folder1/g'? [Ynesfdaq?] n
431 432
  
  $ hg diff --nodates
433
  diff -r a3d963a027aa folder1/g
434 435 436 437 438 439 440
  --- a/folder1/g
  +++ b/folder1/g
  @@ -5,3 +5,4 @@
   4
   5
   d
  +lastline
441 442 443 444 445 446 447 448 449 450 451 452

  $ hg update -C .
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg purge
  $ touch newfile
  $ hg add newfile
  $ hg status
  A newfile
  $ hg revert -i <<EOF
  > n
  > EOF
  forgetting newfile
453
  forget added file newfile (Yn)? n
454 455 456 457 458 459
  $ hg status
  A newfile
  $ hg revert -i <<EOF
  > y
  > EOF
  forgetting newfile
460
  forget added file newfile (Yn)? y
461 462
  $ hg status
  ? newfile