Mercurial > public > mercurial-scm > hg
diff tests/test-push-race.t @ 35709:1a09dad8b85a
evolution: report new unstable changesets
This adds a transaction summary callback that reports the number of
new orphan, content-divergent and phase-divergent changesets.
The code for reporting it is based on the code from the evolve
extension, but simplified a bit. It simply counts the numbers for each
kind of instability before and after the transaction. That's obviously
not very efficient, but it's easy to reason about, so I'm doing this
as a first step that can make us quite confident about the test case
changes. We can optimize it later and make sure that the tests are not
affected. The code has been used in the evolve extension for a long
time and has apparently been sufficiently fast, so it doesn't seem
like a pressing issue.
Unlike the evolve extension's version of this report, this version
applies to all commands (or all transactions run as part of any
command, to be exact).
Differential Revision: https://phab.mercurial-scm.org/D1867
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 14 Jan 2018 23:59:17 -0800 |
| parents | 9b3f95d9783d |
| children | 89630d0b3e23 |
line wrap: on
line diff
--- a/tests/test-push-race.t Wed Jan 10 14:00:23 2018 -0800 +++ b/tests/test-push-race.t Sun Jan 14 23:59:17 2018 -0800 @@ -1707,6 +1707,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets + 1 new orphan changesets new changesets 720c5163ecf6 (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R ./client-other pull @@ -1718,6 +1719,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets + 1 new orphan changesets new changesets 720c5163ecf6 (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R ./client-racy pull @@ -1727,6 +1729,7 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files + 1 new orphan changesets new changesets a98a47d8b85b (run 'hg update' to get a working copy) @@ -1792,6 +1795,7 @@ $ hg -R client-other/ branch --force default marked working directory as branch default $ hg -R client-other/ commit -m "C-W" + 1 new orphan changesets created new head $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'` $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'` @@ -1818,6 +1822,7 @@ remote: added 1 changesets with 0 changes to 1 files (+1 heads) remote: 1 new obsolescence markers remote: obsoleted 1 changesets + remote: 1 new orphan changesets $ release $TESTTMP/watchfile