##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

copies: add config option for writing copy metadata to file and/or changset...
copies: add config option for writing copy metadata to file and/or changset This introduces a config option that lets you choose to write copy metadata to the changeset extras instead of to filelog. There's also an option to write it to both places. I imagine that may possibly be useful when transitioning an existing repo. The copy metadata is stored as two fields in extras: one for copies since p1 and one for copies since p2. I may need to add more information later in order to make copy tracing faster. Specifically, I'm thinking out recording which files were added or removed so that copies._chaincopies() doesn't have to look at the manifest for that. But that would just be an optimization and that can be added once we know if it's necessary. I have also considered saving space by using replacing the destination file path by an index into the "files" list, but that can also be changed later (but before the feature is ready to release). Differential Revision: https://phab.mercurial-scm.org/D6183
Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default
r42317:0e41f40b default
Show More
test-push-checkheads-unpushed-D5.t
113 lines | 3.0 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-unpushed-D5.t
History | Source | Raw |Copy content |Copy permalink
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 ====================================
Testing head checking code: Case D-5
====================================
Mercurial checks for the introduction of new heads on push. Evolution comes
into play to detect if existing branches on the server are being replaced by
some of the new one we push.
This case is part of a series of tests checking this behavior.
Category D: remote head is "obs-affected" locally, but result is not part of the push
TestCase 5: multi-changeset branch, split on multiple other, (head on its own new branch)
.. old-state:
..
.. * 2 branch (1 changeset, and 2 changesets)
..
.. new-state:
..
.. * 1 new branch superceeding the head of the old-2-changesets-branch,
.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other
..
.. expected-result:
..
.. * push the new branch only -> push denied
.. * push the existing branch only -> push allowed
.. /!\ This push create unstability/orphaning on the other hand and we should
.. probably detect/warn agains that.
..
.. graph-summary:
..
.. B ø⇠◔ B'
.. | |
.. A'◔⇢ø |
.. | |/
.. C ● |
.. \|
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir D5
$ cd D5
$ setuprepos
creating basic server and client repo
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd server
$ mkcommit B0
$ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit C0
created new head
$ cd ../client
$ hg pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/D5/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
Boris Feld
phase: report number of non-public changeset alongside the new range...
 r39516 new changesets d73caddc5533:0f88766e02d6 (2 drafts)
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit A1
$ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit B1
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Martin von Zweigbergk
evolution: report new unstable changesets...
 r35727 1 new orphan changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
| o a0802eb7fc1b (draft): A1
| |
| o 0f88766e02d6 (draft): C0
|/
| x d73caddc5533 (draft): B0
| |
| x 8aaa48160adc (draft): A0
|/
o 1e4be0697311 (public): root
Actual testing
--------------
$ hg push --rev 'desc(B1)'
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pushing to $TESTTMP/D5/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 searching for changes
abort: push creates new remote head 25c56d33e4c4!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg push --rev 'desc(A1)'
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pushing to $TESTTMP/D5/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
marmoute
obsolete: reports the number of local changeset obsoleted when unbundling...
 r33249 obsoleted 1 changesets
Martin von Zweigbergk
evolution: report new unstable changesets...
 r35727 1 new orphan changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case D5...
 r32017
$ cd ../..