view tests/test-confused-revert.t @ 45342:150900a17ec2

merge: rework iteration over mergeresult object in checkpathconflicts()

Instead of following pattern:

```
for f, (m, args, msg) in mresult.actions.items():

    if m == mergestatemod.ACTION_*:
        ...
    elif m == mergestatemod.ACTION_*:
        ...
    ....

```

We do:

```
for (f, args, msg) in mresult.getaction((mergestatemod.ACTION_*,)):
    ...

for (f, args, msg) in mresult.getaction((mergestatemod.ACTION_*,)):
    ...
....
```

This makes code bit easier to understand and prevent iterating over actions
which we don't need.

Differential Revision: https://phab.mercurial-scm.org/D8884

  $ hg init
  $ echo foo > a
  $ hg add a
  $ hg commit -m "1"

  $ echo bar > b
  $ hg add b
  $ hg remove a

Should show a removed and b added:

  $ hg status
  A b
  R a

  $ hg revert --all
  forgetting b
  undeleting a

Should show b unknown and a back to normal:

  $ hg status
  ? b

  $ rm b

  $ hg co -C 0
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo foo-a > a
  $ hg commit -m "2a"

  $ hg co -C 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo foo-b > a
  $ hg commit -m "2b"
  created new head

  $ HGMERGE=true hg merge 1
  merging a
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Should show foo-b:

  $ cat a
  foo-b

  $ echo bar > b
  $ hg add b
  $ rm a
  $ hg remove a

Should show a removed and b added:

  $ hg status
  A b
  R a

Revert should fail:

  $ hg revert
  abort: uncommitted merge with no revision specified
  (use 'hg update' or see 'hg help revert')
  [255]

Revert should be ok now:

  $ hg revert -r2 --all
  forgetting b
  undeleting a

Should show b unknown and a marked modified (merged):

  $ hg status
  M a
  ? b

Should show foo-b:

  $ cat a
  foo-b