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)

     1

Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits

     2

     3

  $ cat >> $HGRCPATH << EOF

     4

  > [extensions]

     5

  > absorb=

     6

  > drawdag=$TESTDIR/drawdag.py

     7

  > EOF

     8

     9

  $ hg init

    10

  $ hg debugdrawdag << EOF

    11

  > E

    12

  > |

    13

  > D F

    14

  > |/

    15

  > C

    16

  > |

    17

  > B

    18

  > |

    19

  > A

    20

  > EOF

    21

    22

  $ hg up E -q

    23

  $ echo 1 >> B

    24

  $ echo 2 >> D

    25

  $ hg absorb -a

    26

  warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60

    27

  saved backup bundle to * (glob)

    28

  2 of 2 chunk(s) applied

    29

    30

  $ hg log -G -T '{desc}'

    31

  @  E

    32

  |

    33

  o  D

    34

  |

    35

  o  C

    36

  |

    37

  o  B

    38

  |

    39

  | o  F

    40

  | |

    41

  | o  C

    42

  | |

    43

  | o  B

    44

  |/

    45

  o  A

    46