Mercurial Mercurial > mercurial / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-strip-branch-cache.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sun, 10 Mar 2024 04:53:17 +0100
changeset 51492 2e8a88e5809f
parent 49071 9caf23927d04
child 51493 82c1a388e86a
permissions -rw-r--r--
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.

This test cover a bug that no longer exist.

Define helpers.

  $ hg_log () { hg log -G -T "{rev}:{node|short}"; }
  $ commit () { echo "foo - ${2:-$1}" > $1; hg commit -Aqm "Edited $1"; }
  $ strip() { hg --config extensions.strip= strip -q -r "$1" ; }

Setup hg repo.

  $ hg init repo
  $ cd repo
  $ touch x; hg add x; hg commit -m "initial"
  $ hg clone -q . ../clone
  $ commit a

  $ cd ../clone

  $ commit b

  $ hg pull -q ../repo

  $ ls -1 .hg/cache/branch?*
  .hg/cache/branch2-base
  .hg/cache/branch2-served
  $ cat .hg/cache/branch?-served
  222ae9789a75703f9836e44de7db179cbfd420ee 2
  a3498d6e39376d2456425dd8c692367bdbf00fa2 o default
  222ae9789a75703f9836e44de7db179cbfd420ee o default

  $ hg_log
  o  2:222ae9789a75
  |
  | @  1:a3498d6e3937
  |/
  o  0:7ab0a3bd758a
  

  $ strip '1:'

After the strip the "served" cache is now identical to the "base" one, and the
older one have been actively deleted.

  $ ls -1 .hg/cache/branch?*
  .hg/cache/branch2-base
  .hg/cache/branch2-served
  $ cat .hg/cache/branch?-served
  222ae9789a75703f9836e44de7db179cbfd420ee 2
  a3498d6e39376d2456425dd8c692367bdbf00fa2 o default
  222ae9789a75703f9836e44de7db179cbfd420ee o default

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

  $ commit c
  $ ls -1 .hg/cache/branch?*
  .hg/cache/branch2-base
  .hg/cache/branch2-served
  $ cat .hg/cache/branch?-served
  a1602b357cfca067600406eb19060c7128804d72 1
  a1602b357cfca067600406eb19060c7128804d72 o default


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

  $ hg pull ../repo --quiet
  $ hg heads -T '{rev} {node} {branch}\n'
  2 222ae9789a75703f9836e44de7db179cbfd420ee default
  1 a1602b357cfca067600406eb19060c7128804d72 default
  $ ls -1 .hg/cache/branch?*
  .hg/cache/branch2-base
  .hg/cache/branch2-served
  $ cat .hg/cache/branch?-served
  222ae9789a75703f9836e44de7db179cbfd420ee 2
  a1602b357cfca067600406eb19060c7128804d72 o default
  222ae9789a75703f9836e44de7db179cbfd420ee o default
mercurial