Mercurial > hg
view tests/test-import-merge.t @ 47072:4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Since the dawn of time, people have been forced to rely to lossy introspection
of the index filename to determine what the purpose and role of the revlog they
encounter is. This is hacky, error prone, inflexible, abstraction-leaky,
<insert-your-own-complaints-here>.
In f63299ee7e4d Raphaël introduced a new attribute to track this information:
`revlog_kind`. However it is initialized in an odd place and various instances
end up not having it set. In addition is only tracking some of the information
we end up having to introspect in various pieces of code.
So we add a new attribute that holds more data and is more strictly enforced.
This work is done in collaboration with Raphaël.
The `revlog_kind` one will be removed/adapted in the next changeset. We expect
to be able to clean up various existing piece of code and to simplify coming
work around the newer revlog format.
Differential Revision: https://phab.mercurial-scm.org/D10352
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 06 Apr 2021 05:20:24 +0200 |
parents | f1186c292d03 |
children | 2f2682f40ea0 |
line wrap: on
line source
$ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH $ tipparents() { > hg parents --template "{rev}:{node|short} {desc|firstline}\n" -r tip > } Test import and merge diffs $ hg init repo $ cd repo $ echo a > a $ hg ci -Am adda adding a $ echo a >> a $ hg ci -m changea $ echo c > c $ hg ci -Am addc adding c $ hg up 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo b > b $ hg ci -Am addb adding b created new head $ hg up 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m merge $ hg export . > ../merge.diff $ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff $ cd .. $ hg clone -r2 repo repo2 adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 2 files new changesets 07f494440405:890ecaa90481 updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd repo2 $ hg pull -r3 ../repo pulling from ../repo searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 102a90ea7b4a (run 'hg heads' to see heads, 'hg merge' to merge) Test without --exact and diff.p1 == workingdir.p1 $ hg up 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cat > $TESTTMP/editor.sh <<EOF > env | grep HGEDITFORM > echo merge > \$1 > EOF $ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff applying ../merge.nomsg.diff HGEDITFORM=import.normal.merge $ tipparents 1:540395c44225 changea 3:102a90ea7b4a addb $ hg strip --no-backup tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Test without --exact and diff.p1 != workingdir.p1 $ hg up 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg import ../merge.diff applying ../merge.diff warning: import the patch as a normal revision (use --exact to import the patch as a merge) $ tipparents 2:890ecaa90481 addc $ hg strip --no-backup tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Test with --exact $ hg import --exact ../merge.diff applying ../merge.diff 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ tipparents 1:540395c44225 changea 3:102a90ea7b4a addb $ hg strip --no-backup tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Test with --bypass and diff.p1 == workingdir.p1 $ hg up 1 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg import --bypass ../merge.diff applying ../merge.diff $ tipparents 1:540395c44225 changea 3:102a90ea7b4a addb $ hg strip --no-backup tip Test with --bypass and diff.p1 != workingdir.p1 $ hg up 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg import --bypass ../merge.diff applying ../merge.diff warning: import the patch as a normal revision (use --exact to import the patch as a merge) $ tipparents 2:890ecaa90481 addc $ hg strip --no-backup tip Test with --bypass and --exact $ hg import --bypass --exact ../merge.diff applying ../merge.diff $ tipparents 1:540395c44225 changea 3:102a90ea7b4a addb $ hg strip --no-backup tip $ cd .. Test that --exact on a bad header doesn't corrupt the repo (issue3616) $ hg init repo3 $ cd repo3 $ echo a>a $ hg ci -Aqm0 $ echo a>>a $ hg ci -m1 $ echo a>>a $ hg ci -m2 $ echo a>a $ echo b>>a $ echo a>>a $ hg ci -m3 $ hg export 2 | head -7 > ../a.patch $ hg export tip > out >>> apatch = open("../a.patch", "ab") >>> apatch.write(b"".join(open("out", 'rb').readlines()[7:])) and None $ cd .. $ hg clone -qr0 repo3 repo3-clone $ cd repo3-clone $ hg pull -qr1 ../repo3 $ hg import --exact ../a.patch applying ../a.patch 1 files updated, 0 files merged, 0 files removed, 0 files unresolved patching file a Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). transaction abort! rollback completed abort: patch is damaged or loses information [255] $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files checked 2 changesets with 2 changes to 1 files