tests/test-branch-option.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 09 Apr 2024 22:37:15 +0200
changeset 51595 3a6fae3bef35
parent 48368 8c4881c07f57
permissions -rw-r--r--
outgoing: add a simple fastpath when there is no common This further speed up case like `hg bundle --all` for larger repository. ### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog # 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 before: 316.749699 after: 311.165461 (-1.76%, -5.58) There is further work to be done in this area like not doing any outgoing computation in the stream case for example. however the recent changes already gives use a large win for a small amount of local work. ### 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 = mercurial-public-2024-03-22-zstd-sparse-revlog pre-%ln-change: 1.263859 the-%ln-change: 0.700229 (-44.60%, -0.56) prev-changeset: 0.496050 (-60.75%, -0.77) this-changeset: 0.495243 (-60.81%, -0.77) ## data-env-vars.name = tryton-public-2024-03-22-zstd-sparse-revlog pre-%ln-change: 2.975765 the-%ln-change: 1.870798 (-37.13%, -1.10) prev-changeset: 1.461583 (-50.88%, -1.51) this-changeset: 1.469185 (-50.63%, -1.51) ## data-env-vars.name = pypy-2024-03-22-zstd-sparse-revlog pre-%ln-change: 4.540080 the-%ln-change: 3.401700 (-25.07%, -1.14) prev-changeset: 2.915810 (-35.78%, -1.62) this-changeset: 2.911643 (-35.87%, -1.63) ## data-env-vars.name = heptapod-public-2024-03-25-zstd-sparse-revlog pre-%ln-change: 10.138396 the-%ln-change: 7.750458 (-23.55%, -2.39) prev-changeset: 6.665565 (-34.25%, -3.47) this-changeset: 6.672078 (-34.19%, -3.47) ## data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog pre-%ln-change: 399.484481 the-%ln-change: 346.508952 (-13.26%, -52.98) prev-changeset: 316.749699 (-20.71%, -82.73) this-changeset: 311.165461 (-22.11%, -88.32)

test branch selection options

  $ hg init branch
  $ cd branch
  $ hg branch a
  marked working directory as branch a
  (branches are permanent and global, did you want a bookmark?)
  $ echo a > foo
  $ hg ci -d '0 0' -Ama
  adding foo
  $ echo a2 > foo
  $ hg ci -d '0 0' -ma2
  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg branch c
  marked working directory as branch c
  $ echo c > foo
  $ hg ci -d '0 0' -mc
  $ hg tag -l z
  $ cd ..
  $ hg clone -r 0 branch branch2
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files
  new changesets 5b65ba7c951d
  updating to branch a
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd branch2
  $ hg up 0
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg branch b
  marked working directory as branch b
  $ echo b > foo
  $ hg ci -d '0 0' -mb
  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg --encoding utf-8 branch æ
  marked working directory as branch \xc3\xa6 (esc)
  $ echo ae1 > foo
  $ hg ci -d '0 0' -mae1
  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg --encoding utf-8 branch -f æ
  marked working directory as branch \xc3\xa6 (esc)
  $ echo ae2 > foo
  $ hg ci -d '0 0' -mae2
  created new head
  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg branch -f b
  marked working directory as branch b
  $ echo b2 > foo
  $ hg ci -d '0 0' -mb2
  created new head

unknown branch and fallback

  $ hg in -qbz
  abort: unknown branch 'z'
  [10]
  $ hg in -q ../branch#z
  2:f25d57ab0566
  $ hg out -qbz
  abort: unknown branch 'z'
  [10]

in rev c branch a

  $ hg in -qr c ../branch#a
  1:dd6e60a716c6
  2:f25d57ab0566
  $ hg in -qr c -b a
  1:dd6e60a716c6
  2:f25d57ab0566

out branch .

  $ hg out -q ../branch#.
  1:b84708d77ab7
  4:65511d0e2b55
  $ hg out -q -b .
  1:b84708d77ab7
  4:65511d0e2b55

out branch . non-ascii

  $ hg --encoding utf-8 up æ
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg --encoding latin1 out -q ../branch#.
  2:df5a44224d4e
  3:4f4a5125ca10
  $ hg --encoding latin1 out -q -b .
  2:df5a44224d4e
  3:4f4a5125ca10

clone branch b

  $ cd ..
  $ hg clone branch2#b branch3
  adding changesets
  adding manifests
  adding file changes
  added 3 changesets with 3 changes to 1 files (+1 heads)
  new changesets 5b65ba7c951d:65511d0e2b55
  updating to branch b
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg -q -R branch3 heads b
  2:65511d0e2b55
  1:b84708d77ab7
  $ hg -q -R branch3 parents
  2:65511d0e2b55
  $ rm -rf branch3

clone rev a branch b

  $ hg clone -r a branch2#b branch3
  adding changesets
  adding manifests
  adding file changes
  added 3 changesets with 3 changes to 1 files (+1 heads)
  new changesets 5b65ba7c951d:65511d0e2b55
  updating to branch a
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg -q -R branch3 heads b
  2:65511d0e2b55
  1:b84708d77ab7
  $ hg -q -R branch3 parents
  0:5b65ba7c951d
  $ rm -rf branch3