Mercurial > hg
view tests/test-convert-identity.t @ 45084:07b3166e94ca
commit: check branch change on to-be-committed changeset
This makes a difference when a branch name is passed via the `extra` argument,
which will be used as the branch name for the created changeset. The empty
commit check should use that branch name instead of whatever was set on the
working directory.
Besides fixing the bug for which a test case was extended, it enables to remove
a workaround in the rebase extension, which will be done in a follow-up patch
(D8725).
Differential Revision: https://phab.mercurial-scm.org/D8724
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Fri, 10 Jul 2020 00:44:18 +0200 |
parents | a2c02877b097 |
children | 6c56277317c2 |
line wrap: on
line source
Testing that convert.hg.preserve-hash=true can be used to make hg convert from hg repo to hg repo preserve hashes, even if the computation of the files list in commits change slightly between hg versions. $ cat <<'EOF' >> "$HGRCPATH" > [extensions] > convert = > EOF $ cat <<'EOF' > changefileslist.py > from mercurial import (changelog, extensions) > def wrap(orig, clog, manifest, files, *args, **kwargs): > return orig(clog, manifest, [b"a"], *args, **kwargs) > def extsetup(ui): > extensions.wrapfunction(changelog.changelog, 'add', wrap) > EOF $ hg init repo $ cd repo $ echo a > a; hg commit -qAm a $ echo b > a; hg commit -qAm b $ hg up -qr 0; echo c > c; hg commit -qAm c $ hg merge -qr 1 $ hg commit -m_ --config extensions.x=../changefileslist.py $ hg log -r . -T '{node|short} {files|json}\n' c085bbe93d59 ["a"] Now that we have a commit with a files list that's not what the current hg version would create, check that convert either fixes it or keeps it depending on config: $ hg convert -q . ../convert $ hg --cwd ../convert log -r tip -T '{node|short} {files|json}\n' b7c4d4bbacd3 [] $ rm -rf ../convert $ hg convert -q . ../convert --config convert.hg.preserve-hash=true $ hg --cwd ../convert log -r tip -T '{node|short} {files|json}\n' c085bbe93d59 ["a"] $ rm -rf ../convert