view tests/test-push-checkheads-pruned-B6.t @ 6336:453861da6922

topic: use fully qualified branch name during exchange For the entire duration of exchange process, we now use branch//namespace/topic format for branchmap, head checking, etc. Sometimes we still need to disable this feature (e.g. when pushing to a repo that doesn't have topic extension enabled), but every other case should be handled using the new fqbn format. This applies both to internal API, such as having fqbn as branchmap keys and even making ctx.branch() return fqbn, and to UI, such as users seeing fqbn in hg branches output and messages from hg push. Things to note: now we're wrapping revbranchcache.branchinfo() during the extension setup, instead of doing it only in one place in _headssummary(). We're also using override_context_branch context manager that makes ctx.branch() return fqbn also in cases when we call the original _headssummary(). There are still places in the UI where branch names are not in fqbn format, because they don't take part in the exchange process.
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 12 Nov 2022 16:24:55 +0400
parents fc60328270ac
children b1d010b2e6c4
line wrap: on
line source

====================================
Testing head checking code: Case B-6
====================================

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 B: simple case involving pruned changesets
TestCase 6: single changesets, pruned then superseded (on a new changeset)

.. old-state:
..
.. * 1 changeset branch
..
.. new-state:
..
.. * old branch is rewritten onto another one,
.. * the new version is then pruned.
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
..   A ø⇠⊗ A'
..     | |
..     | ◔ B
..     |/
..     ●

  $ . $TESTDIR/testlib/push-checkheads-util.sh

Test setup
----------

  $ mkdir B6
  $ cd B6
  $ 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 B0
  created new head
  $ mkcommit A1
  $ hg up 'desc(B0)'
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
  1 new obsolescence markers
  obsoleted 1 changesets
  $ hg debugobsolete --record-parents `getid "desc(A1)"`
  1 new obsolescence markers
  obsoleted 1 changesets
  $ hg log -G --hidden
  x  ba93660aff8d [default] (draft): A1
  |
  @  74ff5441d343 [default] (draft): B0
  |
  | x  8aaa48160adc [default] (draft): A0
  |/
  o  1e4be0697311 [default] (public): root
  

Actual testing
--------------

  $ hg push
  pushing to $TESTTMP/B6/server (glob)
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files (+1 heads)
  2 new obsolescence markers
  obsoleted 1 changesets

  $ cd ../..