Mercurial > hg
view tests/test-hooklib-reject_merge_commits.t @ 50443:3b199593fedd
hidden: add support to explicitly access hidden changesets via HTTP
We now detect hidden access request and validate them while handling HTTP
wireprotocol command. This changeset only introduces server support. Client
support is added in a subsequent changeset.
The mechanism we use for the HTTP wireprotocol is the same as the one used to
lift filtering for hgweb. The use of the global `access-hidden` parameter in
the http url is a simple and effective approach that
* works around the lack of global parameters in wire protocol v1,
* reuses the mechanism used for hgweb (that does not use the wireproto), and
* can be safely ignored by older client (fitting the best effort contract).
The feature is still experimental, so we can easily update the implementation
details in the future. However, landing a first implementation now will help
test the feature in the wild and iterate on alternative implementations if
deemed necessary.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Sat, 13 Apr 2019 02:01:26 +0200 |
parents | 4cabeea6d214 |
children |
line wrap: on
line source
$ cat <<EOF >> $HGRCPATH > [extensions] > hooklib = > > [phases] > publish = False > EOF $ hg init a $ hg --cwd a debugbuilddag '.:parent.:childa*parent/childa<parent@otherbranch./childa' $ hg --cwd a log -G o changeset: 4:a9fb040caedd |\ branch: otherbranch | | tag: tip | | parent: 3:af739dfc49b4 | | parent: 1:66f7d451a68b | | user: debugbuilddag | | date: Thu Jan 01 00:00:04 1970 +0000 | | summary: r4 | | | o changeset: 3:af739dfc49b4 | | branch: otherbranch | | parent: 0:1ea73414a91b | | user: debugbuilddag | | date: Thu Jan 01 00:00:03 1970 +0000 | | summary: r3 | | +---o changeset: 2:a6b287721c3b | |/ parent: 0:1ea73414a91b | | parent: 1:66f7d451a68b | | user: debugbuilddag | | date: Thu Jan 01 00:00:02 1970 +0000 | | summary: r2 | | o | changeset: 1:66f7d451a68b |/ tag: childa | user: debugbuilddag | date: Thu Jan 01 00:00:01 1970 +0000 | summary: r1 | o changeset: 0:1ea73414a91b tag: parent user: debugbuilddag date: Thu Jan 01 00:00:00 1970 +0000 summary: r0 $ hg init b $ cat <<EOF >> b/.hg/hgrc > [hooks] > pretxnchangegroup.reject_merge_commits = \ > python:hgext.hooklib.reject_merge_commits.hook > EOF $ hg --cwd b pull ../a -r a6b287721c3b pulling from ../a adding changesets adding manifests adding file changes error: pretxnchangegroup.reject_merge_commits hook failed: a6b287721c3b rejected as merge on the same branch. Please consider rebase. transaction abort! rollback completed abort: a6b287721c3b rejected as merge on the same branch. Please consider rebase. [255] $ hg --cwd b pull ../a -r 1ea73414a91b pulling from ../a adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files new changesets 1ea73414a91b (1 drafts) (run 'hg update' to get a working copy) $ hg --cwd b pull ../a -r a9fb040caedd pulling from ../a searching for changes adding changesets adding manifests adding file changes added 3 changesets with 0 changes to 0 files new changesets 66f7d451a68b:a9fb040caedd (3 drafts) (run 'hg update' to get a working copy)