branchcache: stop writing more branchcache file on disk than needed Before this change, we were unconditionally writing a branchmap file for the filter level passed to `update_disk`. This is actually counter productive if no update were needed for this filter level. In many case, the branch cache for a filter level is identical to its parent "subset" and it is better to simply keep the subset update and reuse it every time instead of having to do identical work for similar subset. So we change the `update_disk` method to only write a file when that filter level differ from its parent. This removes many cases where identical files were written, requiring multiple boring update in the test suite. The only notable changes is the change to `test-strip-branch-cache.t`, this case was checking a scenario that no longer reproduce the bug as writing less branchmap file result in less stalled cache on disk. Strictly speaking, we could create a more convoluted scenario that create a similar issue. However the next changeset would also cover that scenario so we directly updated that test case to a "no longer buggy" state.

     1

This test cover a bug that no longer exist.

     2

     3

Define helpers.

     4

     5

  $ hg_log () { hg log -G -T "{rev}:{node|short}"; }

     6

  $ commit () { echo "foo - ${2:-$1}" > $1; hg commit -Aqm "Edited $1"; }

     7

  $ strip() { hg --config extensions.strip= strip -q -r "$1" ; }

     8

     9

Setup hg repo.

    10

    11

  $ hg init repo

    12

  $ cd repo

    13

  $ touch x; hg add x; hg commit -m "initial"

    14

  $ hg clone -q . ../clone

    15

  $ commit a

    16

    17

  $ cd ../clone

    18

    19

  $ commit b

    20

    21

  $ hg pull -q ../repo

    22

    23

  $ ls -1 .hg/cache/branch?*

    24

  .hg/cache/branch2-base

    25

  .hg/cache/branch2-served

    26

  $ cat .hg/cache/branch?-served

    27

  222ae9789a75703f9836e44de7db179cbfd420ee 2

    28

  a3498d6e39376d2456425dd8c692367bdbf00fa2 o default

    29

  222ae9789a75703f9836e44de7db179cbfd420ee o default

    30

    31

  $ hg_log

    32

  o  2:222ae9789a75

    33

  |

    34

  | @  1:a3498d6e3937

    35

  |/

    36

  o  0:7ab0a3bd758a

    37

    38

    39

  $ strip '1:'

    40

    41

After the strip the "served" cache is now identical to the "base" one, and the

    42

older one have been actively deleted.

    43

    44

  $ ls -1 .hg/cache/branch?*

    45

  .hg/cache/branch2-base

    46

  .hg/cache/branch2-served

    47

  $ cat .hg/cache/branch?-served

    48

  222ae9789a75703f9836e44de7db179cbfd420ee 2

    49

  a3498d6e39376d2456425dd8c692367bdbf00fa2 o default

    50

  222ae9789a75703f9836e44de7db179cbfd420ee o default

    51

    52

We do a new commit and we get a new valid branchmap for the served version

    53

    54

  $ commit c

    55

  $ ls -1 .hg/cache/branch?*

    56

  .hg/cache/branch2-base

    57

  .hg/cache/branch2-served

    58

  $ cat .hg/cache/branch?-served

    59

  a1602b357cfca067600406eb19060c7128804d72 1

    60

  a1602b357cfca067600406eb19060c7128804d72 o default

    61

    62

    63

On pull we end up with the same tip, and so wrongly reuse the invalid cache and crash.

    64

    65

  $ hg pull ../repo --quiet

    66

  $ hg heads -T '{rev} {node} {branch}\n'

    67

  2 222ae9789a75703f9836e44de7db179cbfd420ee default

    68

  1 a1602b357cfca067600406eb19060c7128804d72 default

    69

  $ ls -1 .hg/cache/branch?*

    70

  .hg/cache/branch2-base

    71

  .hg/cache/branch2-served

    72

  $ cat .hg/cache/branch?-served

    73

  222ae9789a75703f9836e44de7db179cbfd420ee 2

    74

  a1602b357cfca067600406eb19060c7128804d72 o default

    75

  222ae9789a75703f9836e44de7db179cbfd420ee o default