Mercurial > hg-stable
view tests/test-hooklib-changeset_obsoleted.t @ 44650:5f9c917e3b50
phabricator: teach `getoldnodedrevmap()` to handle folded reviews
The tricky part here is reasoning through all of the possible predecessor
scenarios. In the typical case of submitting a folded range and then
resubmitting it (also folded), filtering the list of commits for the diff stored
on Phabricator through the local predecessor list for each single node will
result in the typical 1:1 mapping to the old node.
There are edge cases like using `hg fold` within the range prior to
resubmitting, that will result in mapping to multiple old nodes. In that case,
the first direct predecessor is needed for the base of the diff, and the last
direct predecessor is needed for the head of the diff in order to make sure that
the entire range is included in the diff content. And none of this matters for
commits in the middle of the range, as they are never used.
Fortunately the only crucial thing here is the `drev` number for each node. For
these complicated cases where there are multiple old nodes, simply ignore them
all. This will cause `createdifferentialrevision()` to generate a new diff
(within the same Differential), and avoids complicating the code.
Differential Revision: https://phab.mercurial-scm.org/D8311
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 16 Mar 2020 13:36:12 -0400 |
parents | 4cabeea6d214 |
children | 04ef381000a8 |
line wrap: on
line source
$ cat <<EOF >> $HGRCPATH > [experimental] > evolution = true > > [extensions] > notify = > hooklib = > > [phases] > publish = False > > [notify] > sources = pull > diffstat = False > messageidseed = example > domain = example.com > > [reposubs] > * = baz > EOF $ hg init a $ hg --cwd a debugbuilddag +2 $ hg init b $ cat <<EOF >> b/.hg/hgrc > [hooks] > incoming.notify = python:hgext.notify.hook > pretxnclose.changeset_obsoleted = python:hgext.hooklib.changeset_obsoleted.hook > EOF $ hg --cwd b pull ../a | "$PYTHON" $TESTDIR/unwrap-message-id.py pulling from ../a requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 0 changes to 0 files new changesets 1ea73414a91b:66f7d451a68b (2 drafts) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Date: * (glob) Subject: changeset in * (glob) From: debugbuilddag@example.com X-Hg-Notification: changeset 1ea73414a91b Message-Id: <hg.81c297828fd2d5afaadf2775a6a71b74143b6451dfaac09fac939e9107a50d01@example.com> To: baz@example.com changeset 1ea73414a91b in $TESTTMP/b details: $TESTTMP/b?cmd=changeset;node=1ea73414a91b description: r0 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Date: * (glob) Subject: changeset in * (glob) From: debugbuilddag@example.com X-Hg-Notification: changeset 66f7d451a68b Message-Id: <hg.364d03da7dc13829eb779a805be7e37f54f572e9afcea7d2626856a794d3e8f3@example.com> To: baz@example.com changeset 66f7d451a68b in $TESTTMP/b details: $TESTTMP/b?cmd=changeset;node=66f7d451a68b description: r1 (run 'hg update' to get a working copy) $ hg --cwd a debugobsolete 1ea73414a91b0920940797d8fc6a11e447f8ea1e 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg --cwd a push ../b --hidden | "$PYTHON" $TESTDIR/unwrap-message-id.py 1 new orphan changesets pushing to ../b searching for changes no changes found Subject: changeset abandoned In-reply-to: <hg.81c297828fd2d5afaadf2775a6a71b74143b6451dfaac09fac939e9107a50d01@example.com> Message-Id: <hg.d6329e9481594f0f3c8a84362b3511318bfbce50748ab1123f909eb6fbcab018@example.com> Date: * (glob) From: test@example.com To: baz@example.com This changeset has been abandoned. 1 new obsolescence markers obsoleted 1 changesets