status: prefer relative paths in Rust code … when the repository root is under the current directory, so the kernel needs to traverse fewer directory in every call to `read_dir` or `symlink_metadata`. Better yet would be to use libc functions like `openat` and `fstatat` to remove such repeated traversals entirely, but the standard library does not provide APIs based on those. Maybe with a crate like https://crates.io/crates/openat instead? Benchmarks of `rhg status` show that this patch is neutral in some configurations, and makes the command up to ~20% faster in others. Below is semi-arbitrary subset of results. The four numeric columns are: time (in seconds) with this changeset’s parent, time with this changeset, time difference (negative is better), time ratio (less than 1 is better). ``` mercurial-dirstate-v1 | default-plain-clean.no-iu.pbr | 0.0061 -> 0.0059: -0.0002 (0.97) mercurial-dirstate-v2 | default-plain-clean.no-iu.pbr | 0.0029 -> 0.0028: -0.0001 (0.97) mozilla-dirstate-v1 | default-plain-clean.no-iu.pbr | 0.2110 -> 0.2102: -0.0007 (1.00) mozilla-dirstate-v2 | default-copies-clean.ignored.pbr | 0.0489 -> 0.0401: -0.0088 (0.82) mozilla-dirstate-v2 | default-copies-clean.no-iu.pbr | 0.0479 -> 0.0393: -0.0085 (0.82) mozilla-dirstate-v2 | default-copies-large.all.pbr | 0.1262 -> 0.1210: -0.0051 (0.96) mozilla-dirstate-v2 | default-copies-small.ignored-unknown.pbr | 0.1262 -> 0.1200: -0.0062 (0.95) mozilla-dirstate-v2 | default-copies-small.ignored.pbr | 0.0536 -> 0.0417: -0.0119 (0.78) mozilla-dirstate-v2 | default-copies-small.no-iu.pbr | 0.0482 -> 0.0393: -0.0089 (0.81) mozilla-dirstate-v2 | default-plain-clean.ignored.pbr | 0.0518 -> 0.0402: -0.0116 (0.78) mozilla-dirstate-v2 | default-plain-clean.no-iu.pbr | 0.0481 -> 0.0392: -0.0088 (0.82) mozilla-dirstate-v2 | default-plain-large.all.pbr | 0.1271 -> 0.1218: -0.0052 (0.96) mozilla-dirstate-v2 | default-plain-small.ignored-unknown.pbr | 0.1225 -> 0.1202: -0.0022 (0.98) mozilla-dirstate-v2 | default-plain-small.ignored.pbr | 0.0510 -> 0.0418: -0.0092 (0.82) mozilla-dirstate-v2 | default-plain-small.no-iu.pbr | 0.0480 -> 0.0394: -0.0086 (0.82) netbeans-dirstate-v1 | default-plain-clean.no-iu.pbr | 0.1442 -> 0.1422: -0.0020 (0.99) netbeans-dirstate-v2 | default-plain-clean.no-iu.pbr | 0.0325 -> 0.0282: -0.0043 (0.87) ``` Differential Revision: https://phab.mercurial-scm.org/D12175

     1

====================================

     2

Testing head checking code: Case A-7

     3

====================================

     4

     5

Mercurial checks for the introduction of new heads on push. Evolution comes

     6

into play to detect if existing branches on the server are being replaced by

     7

some of the new one we push.

     8

     9

This case is part of a series of tests checking this behavior.

    10

    11

Category A: simple case involving a branch being superceeded by another.

    12

TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

    13

    14

.. old-state:

    15

..

    16

.. * 2 branch (1-changeset, and 2-changesets)

    17

..

    18

.. new-state:

    19

..

    20

.. * 1 new branch superceeding the head of the old-2-changesets-branch,

    21

.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other

    22

..

    23

.. expected-result:

    24

..

    25

.. * push allowed

    26

..

    27

.. graph-summary:

    28

..

    29

..   B ø⇠◔ B'

    30

..     | |

    31

.. A'◔⇢ø |

    32

..   | |/

    33

.. C ● |

    34

..    \|

    35

..     ●

    36

    37

  $ . $TESTDIR/testlib/push-checkheads-util.sh

    38

    39

Test setup

    40

----------

    41

    42

  $ mkdir A7

    43

  $ cd A7

    44

  $ setuprepos

    45

  creating basic server and client repo

    46

  updating to branch default

    47

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    48

  $ cd server

    49

  $ mkcommit B0

    50

  $ hg up 0

    51

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

    52

  $ mkcommit C0

    53

  created new head

    54

  $ cd ../client

    55

  $ hg pull

    56

  pulling from $TESTTMP/A7/server

    57

  searching for changes

    58

  adding changesets

    59

  adding manifests

    60

  adding file changes

    61

  added 2 changesets with 2 changes to 2 files (+1 heads)

    62

  new changesets d73caddc5533:0f88766e02d6 (2 drafts)

    63

  (run 'hg heads' to see heads, 'hg merge' to merge)

    64

  $ hg up 'desc(C0)'

    65

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    66

  $ mkcommit A1

    67

  $ hg up 0

    68

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

    69

  $ mkcommit B1

    70

  created new head

    71

  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

    72

  1 new obsolescence markers

    73

  obsoleted 1 changesets

    74

  1 new orphan changesets

    75

  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`

    76

  1 new obsolescence markers

    77

  obsoleted 1 changesets

    78

  $ hg log -G --hidden

    79

  @  25c56d33e4c4 (draft): B1

    80

  |

    81

  | o  a0802eb7fc1b (draft): A1

    82

  | |

    83

  | o  0f88766e02d6 (draft): C0

    84

  |/

    85

  | x  d73caddc5533 (draft): B0

    86

  | |

    87

  | x  8aaa48160adc (draft): A0

    88

  |/

    89

  o  1e4be0697311 (public): root

    90

    91

    92

Actual testing

    93

--------------

    94

    95

  $ hg push

    96

  pushing to $TESTTMP/A7/server

    97

  searching for changes

    98

  adding changesets

    99

  adding manifests

   100

  adding file changes

   101

  added 2 changesets with 2 changes to 2 files (+1 heads)

   102

  2 new obsolescence markers

   103

  obsoleted 2 changesets

   104

   105

  $ cd ../..