view tests/test-merge4.t @ 51576:de5bf3fe0233

revset: stop serializing node when using "%ln"

Turning hundred of thousand of node from node to hex and back can be slow… what
about we stop doing it?

In many case were we are using node id we should be using revision id. However
this is not a good reason to have a stupidly slow implementation of "%ln".

This caught my attention again because the phase discovery during push make an
extensive use of "%ln" or huge set. In absolute, that phase discovery probably
should use "%ld" and need to improves its algorithmic complexity, but improving
"%ln" seems simple and long overdue. This greatly speeds up `hg push` on
repository with many drafts.

Here are some relevant poulpe benchmarks:

### data-env-vars.name                             = mozilla-try-2023-03-22-zstd-sparse-revlog
  # benchmark.name                                 = hg.command.push
  # bin-env-vars.hg.flavor                         = default
  # bin-env-vars.hg.py-re2-module                  = default
  # benchmark.variants.explicit-rev                = all-out-heads
  # benchmark.variants.issue6528                   = disabled
  # benchmark.variants.protocol                    = ssh
  # benchmark.variants.reuse-external-delta-parent = default

 ## benchmark.variants.revs                        = any-1-extra-rev
before: 44.235070
after:  20.416329 (-53.85%, -23.82)
 ## benchmark.variants.revs                        = any-100-extra-rev
before: 49.234697
after:  26.519829 (-46.14%, -22.71)



### benchmark.name                = hg.command.bundle
  # bin-env-vars.hg.flavor        = default
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.revs       = all
  # benchmark.variants.type       = none-streamv2
 ## data-env-vars.name            = heptapod-public-2024-03-25-zstd-sparse-revlog
before:  10.138396
after:    7.750458  (-23.55%, -2.39)
 ## data-env-vars.name            = mercurial-public-2024-03-22-zstd-sparse-revlog
before:   1.263859
after:    0.700229  (-44.60%, -0.56)
 ## data-env-vars.name            = mozilla-try-2023-03-22-zstd-sparse-revlog
before: 399.484481
after:  346.5089 (-13.26%, -52.98)
 ## data-env-vars.name            = pypy-2024-03-22-zstd-sparse-revlog
before:   4.540080
after:    3.401700  (-25.07%, -1.14)
 ## data-env-vars.name            = tryton-public-2024-03-22-zstd-sparse-revlog
before:   2.975765
after:    1.870798  (-37.13%, -1.10)

  $ hg init repo
  $ cd repo
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c

Test hg behaves when committing with a missing file added by a merge

  $ hg commit -m "commit #3"
  abort: cannot commit merge with missing files
  [255]


Test conflict*() revsets

# Bad usage
  $ hg log -r 'conflictlocal(foo)'
  hg: parse error: conflictlocal takes no arguments
  [10]
  $ hg log -r 'conflictother(foo)'
  hg: parse error: conflictother takes no arguments
  [10]
  $ hg co -C .
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# No merge parents when not merging
  $ hg log -r 'conflictlocal() + conflictother()'
# No merge parents when there is no conflict
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ hg log -r 'conflictlocal() + conflictother()'
  $ hg co -C .
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo conflict > b
  $ hg ci -Aqm 'conflicting change to b'
  $ hg merge 1
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  0 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]
# Shows merge parents when there is a conflict
  $ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
  3 conflicting change to b
  $ hg log -r 'conflictother()' -T '{rev} {desc}\n'
  1 commit #1