view tests/test-commit-unresolved.t @ 52176:72bc29f01570

revlog: add glue to use a pure-Rust VFS

This will save us a lot of calling back into Python, which is always
horribly expensive.

We are now faster in all benchmarked cases except for `log --patch`
specifically on mozilla-try. Fixing this will happen in a later patch.

```
### data-env-vars.name            = mercurial-devel-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 1.760765  ~~~~~
5559d7e63ec3: 1.555513  (-11.66%, -0.21)
### data-env-vars.name            = mozilla-try-2024-03-26-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 62.848869  ~~~~~
5559d7e63ec3: 58.113051   (-7.54%, -4.74)
### data-env-vars.name            = mozilla-try-2024-03-26-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 10
  # benchmark.variants.patch      = yes
  # benchmark.variants.rev        = none
e679697a6ca4: 3.173532  ~~~~~
5559d7e63ec3: 3.543591  (+11.66%, +0.37)
### data-env-vars.name            = mozilla-try-2024-03-26-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 1000
  # benchmark.variants.patch      = no
  # benchmark.variants.rev        = none
e679697a6ca4: 1.214698  ~~~~~
5559d7e63ec3: 1.192478   (-1.83%, -0.02)
### data-env-vars.name            = mozilla-unified-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 56.205474  ~~~~~
5559d7e63ec3: 51.520074   (-8.34%, -4.69)
### data-env-vars.name            = mozilla-unified-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 10
  # benchmark.variants.patch      = yes
  # benchmark.variants.rev        = none
e679697a6ca4: 2.105419  ~~~~~
5559d7e63ec3: 2.051849   (-2.54%, -0.05)
### data-env-vars.name            = mozilla-unified-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 1000
  # benchmark.variants.patch      = no
  # benchmark.variants.rev        = none
e679697a6ca4: 0.309960  ~~~~~
5559d7e63ec3: 0.299035   (-3.52%, -0.01)
### data-env-vars.name            = tryton-public-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 1.849832  ~~~~~
5559d7e63ec3: 1.805076   (-2.42%, -0.04)
### data-env-vars.name            = tryton-public-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 10
  # benchmark.variants.patch      = yes
  # benchmark.variants.rev        = none
e679697a6ca4: 0.289521  ~~~~~
5559d7e63ec3: 0.279889   (-3.33%, -0.01)
### data-env-vars.name            = tryton-public-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 1000
  # benchmark.variants.patch      = no
  # benchmark.variants.rev        = none
e679697a6ca4: 0.332270  ~~~~~
5559d7e63ec3: 0.323324   (-2.69%, -0.01)
```

#testcases abortcommand abortflag
#if abortflag
  $ cat >> $HGRCPATH <<EOF
  > [alias]
  > abort = merge --abort
  > EOF
#endif

  $ addcommit () {
  >     echo $1 > $1
  >     hg add $1
  >     hg commit -d "${2} 0" -m $1
  > }

  $ commit () {
  >     hg commit -d "${2} 0" -m $1
  > }

  $ hg init a
  $ cd a
  $ addcommit "A" 0
  $ addcommit "B" 1
  $ echo "C" >> A
  $ commit "C" 2

  $ hg update -C 0
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo "D" >> A
  $ commit "D" 3
  created new head

State before the merge

  $ hg status
  $ hg id
  e45016d2b3d3 tip
  $ hg summary
  parent: 3:e45016d2b3d3 tip
   D
  branch: default
  commit: (clean)
  update: 2 new changesets, 2 branch heads (merge)
  phases: 4 draft

Testing the abort functionality first in case of conflicts

  $ hg abort
  abort: no merge in progress (abortflag !)
  abort: no operation in progress (abortcommand !)
  [20]

  $ hg merge
  merging A
  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]

  $ hg merge --abort e4501
  abort: cannot specify a node with --abort
  [10]
  $ hg merge --abort --rev e4501
  abort: cannot specify both --abort and --rev
  [10]

#if abortcommand
when in dry-run mode
  $ hg abort --dry-run
  merge in progress, will be aborted
#endif

  $ hg abort
  aborting the merge, updating back to e45016d2b3d3
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

Checking that we got back in the same state

  $ hg status
  ? A.orig
  $ hg id
  e45016d2b3d3 tip
  $ hg summary
  parent: 3:e45016d2b3d3 tip
   D
  branch: default
  commit: 1 unknown (clean)
  update: 2 new changesets, 2 branch heads (merge)
  phases: 4 draft

Merging a conflict araises

  $ hg merge
  merging A
  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]

Correct the conflict without marking the file as resolved

  $ echo "ABCD" > A
  $ hg commit -m "Merged"
  abort: unresolved merge conflicts (see 'hg help resolve')
  [20]

Mark the conflict as resolved and commit

  $ hg resolve -m A
  (no more unresolved files)
  $ hg commit -m "Merged"

Test that if a file is removed but not marked resolved, the commit still fails
(issue4972)

  $ hg up ".^"
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ hg merge 2
  merging A
  warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
  [1]
  $ hg rm --force A
  $ hg commit -m merged
  abort: unresolved merge conflicts (see 'hg help resolve')
  [20]

  $ hg resolve -ma
  (no more unresolved files)
  $ hg commit -m merged
  created new head

Testing the abort functionality in case of no conflicts

  $ hg update -C 0
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ addcommit "E" 4
  created new head
  $ hg id
  68352a18a7c4 tip

  $ hg merge -r 4
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

  $ hg merge --preview --abort
  abort: cannot specify both --abort and --preview
  [10]

  $ hg abort
  aborting the merge, updating back to 68352a18a7c4
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg id
  68352a18a7c4 tip

  $ cd ..