Mercurial > evolve
view tests/test-push-checkheads-multi-topics-F1.t @ 5273:aca826b5bd4d
obslog: use unfiltered repo for --no-graph implementation too
repo.unfiltered() is used for graph version of obslog, because if we want to
filter non-local changesets, we only have to provide --filternonlocal flag on
the command line and _nodesandmarkers() will handle filtering. But that means
for obslog without -f to work correctly we need to provide unfiltered repo to
that function. With this patch both implementations of obslog (--graph and
--no-graph) see the same repo.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 03 May 2020 20:11:37 +0800 |
parents | 5a46f156c9b7 |
children | 35e769c9604f fc60328270ac |
line wrap: on
line source
==================================== Testing head checking code: Case E-1 ==================================== 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 F: case involving changeset on multiple topic TestCase 1: moving a branch to another location .. old-state: .. .. * 1-changeset on topic Y .. * 1-changeset on topic Z (above Y) .. .. new-state: .. .. * 1-changeset on topic Y .. * 1-changeset on topic Z (rebased away from A0) .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. B ø⇠◔ B' topic Z .. | | .. A ◔ | topic Y .. |/ .. ● $ . $TESTDIR/testlib/topic_setup.sh $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir E1 $ cd E1 $ setuprepos creating basic server and client repo updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd client $ hg topic -r . Y switching to topic Y changed topic on 1 changesets to "Y" $ hg topic Z $ mkcommit B0 active topic 'Z' grew its first changeset (see 'hg help topics' for more information) $ hg push pushing to $TESTTMP/E1/server searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 2 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets $ hg up 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg topic Z marked working directory as topic: Z $ mkcommit B1 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 845eeb768064 (draft)[Z]: B1 | | x e1494106e1ca (draft)[Z]: B0 | | | o f5cd873e2965 (draft)[Y]: A0 |/ | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/E1/server searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets $ cd ../..