Mercurial > hg
view tests/test-push-checkheads-unpushed-D1.t @ 43162:3c6976b1f693
py3-discovery: using plain str in stats dict
rust-cpython converts automatically from Rust strings to
the appropriate `str` for the target Python version.
Insisting on discovery stats dict keys to be bytes hence breaks
the process (this is spotted by test-setdiscovery.t).
Now that byteify-strings has been run on the entire
codebase, and the import transformer is not there any more,
the simplest fix is to make the keys plain str again.
Another possible fix would be to forcefully convert to bytes in
rust-cpython code, but that feels less natural, and would probably
have to be reverted down the road.
Differential Revision: https://phab.mercurial-scm.org/D7039
author | Georges Racinet <georges.racinet@octobus.net> |
---|---|
date | Thu, 10 Oct 2019 11:33:33 +0200 |
parents | 34a46d48d24e |
children | 122f0b59f5f0 |
line wrap: on
line source
==================================== Testing head checking code: Case D-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 D: remote head is "obs-affected" locally, but result is not part of the push TestCase 1: remote head is rewritten, but successors is not part of the push .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * 1 changeset branch succeeding the old branch .. * 1 new unrelated branch .. .. expected-result: .. .. * pushing only the unrelated branch: denied .. .. graph-summary: .. .. A ø⇠○ A' .. |/ .. | ◔ B .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir D1 $ cd D1 $ 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 up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head $ hg log -G --hidden @ 74ff5441d343 (draft): B0 | | o f6082bc4ffef (draft): A1 |/ | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push -r 'desc(B0)' pushing to $TESTTMP/D1/server searching for changes abort: push creates new remote head 74ff5441d343! (merge or see 'hg help push' for details about pushing new heads) [255] $ cd ../..