annotate tests/test-push-checkheads-unpushed-D1.t @ 41163:0101a35deae2

phabricator: warn if unable to amend, instead of aborting after posting

There was a divergence in behavior here between obsolete and strip based
amending.  I first noticed the abort when testing outside of the test harness,
but then had trouble recreating it here after reverting the code changes.  It
turns out, strip based amend was successfully amending the public commit after
it was posted!  It looks like the protection is in the `commit --amend` command,
not in the underlying code that it calls.

I considered doing a preflight check and aborting.  But the locks are only
acquired at the end, if amending, and this is too large a section of code to be
wrapped in a maybe-it's-held-or-not context manager for my tastes.
Additionally, some people do post-push reviews, and amending is the default
behavior, so they shouldn't see a misleading error message.

The lack of a 'Differential Revision' entry in the commit message breaks a
{phabreview} test, so it had to be partially conditionalized.

====================================
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)"`
  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 ../..