This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9525

singlehead: introduce option to restrict to public changes
ClosedPublic

Authored by joerg.sonnenberger on Dec 5 2020, 5:36 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4d5e2fd53707: singlehead: introduce option to restrict to public changes
Summary

The new experimental.single-head-per-branch:public-changes-only option
restricts the single-head-per-branch filter to public changesets. This
is useful when serving one repository with different views as publishing
and non-publishing repository.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare requested changes to this revision.Dec 7 2020, 5:11 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/localrepo.py
2258

filter shadows the Python built-in func, please pick another name

This revision now requires changes to proceed.Dec 7 2020, 5:11 AM
Alphare accepted this revision.Dec 7 2020, 11:52 AM
pulkit accepted this revision.Dec 10 2020, 3:44 AM
This revision is now accepted and ready to land.Dec 10 2020, 3:44 AM

Revision Contents
Changeset List

Diff 24167

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'single-head-per-branch:account-closed-heads', b'single-head-per-branch:account-closed-heads',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'single-head-per-branch:public-changes-only',
default=False,
)
coreconfigitem(
b'experimental',
b'sshserver.support-v2', b'sshserver.support-v2',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'sparse-read', b'sparse-read',
default=False, default=False,
) )

mercurial/localrepo.py

singleheadopt = (b'experimental', b'single-head-per-branch') singleheadopt = (b'experimental', b'single-head-per-branch')
singlehead = repo.ui.configbool(*singleheadopt) singlehead = repo.ui.configbool(*singleheadopt)
if singlehead: if singlehead:
singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1] singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1]
accountclosed = singleheadsub.get( accountclosed = singleheadsub.get(
b"account-closed-heads", False b"account-closed-heads", False
) )
scmutil.enforcesinglehead(repo, tr2, desc, accountclosed) if singleheadsub.get(b"public-changes-only", False):
filtername = b"immutable"
AlphareUnsubmitted
Not Done

filter shadows the Python built-in func, please pick another name

Alphare: `filter` shadows the Python built-in func, please pick another name
else:
filtername = b"visible"
scmutil.enforcesinglehead(
repo, tr2, desc, accountclosed, filtername
)
if hook.hashook(repo.ui, b'pretxnclose-bookmark'): if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
for name, (old, new) in sorted( for name, (old, new) in sorted(
tr.changes[b'bookmarks'].items() tr.changes[b'bookmarks'].items()
): ):
args = tr.hookargs.copy() args = tr.hookargs.copy()
args.update(bookmarks.preparehookargs(name, old, new)) args.update(bookmarks.preparehookargs(name, old, new))
repo.hook( repo.hook(
b'pretxnclose-bookmark', b'pretxnclose-bookmark',

mercurial/scmutil.py

def nodesummaries(repo, nodes, maxnumnodes=4): def nodesummaries(repo, nodes, maxnumnodes=4):
if len(nodes) <= maxnumnodes or repo.ui.verbose: if len(nodes) <= maxnumnodes or repo.ui.verbose:
return b' '.join(short(h) for h in nodes) return b' '.join(short(h) for h in nodes)
first = b' '.join(short(h) for h in nodes[:maxnumnodes]) first = b' '.join(short(h) for h in nodes[:maxnumnodes])
return _(b"%s and %d others") % (first, len(nodes) - maxnumnodes) return _(b"%s and %d others") % (first, len(nodes) - maxnumnodes)
def enforcesinglehead(repo, tr, desc, accountclosed=False): def enforcesinglehead(repo, tr, desc, accountclosed, filtername):
"""check that no named branch has multiple heads""" """check that no named branch has multiple heads"""
if desc in (b'strip', b'repair'): if desc in (b'strip', b'repair'):
# skip the logic during strip # skip the logic during strip
return return
visible = repo.filtered(b'visible') visible = repo.filtered(filtername)
# possible improvement: we could restrict the check to affected branch # possible improvement: we could restrict the check to affected branch
bm = visible.branchmap() bm = visible.branchmap()
for name in bm: for name in bm:
heads = bm.branchheads(name, closed=accountclosed) heads = bm.branchheads(name, closed=accountclosed)
if len(heads) > 1: if len(heads) > 1:
msg = _(b'rejecting multiple heads on branch "%s"') msg = _(b'rejecting multiple heads on branch "%s"')
msg %= name msg %= name
hint = _(b'%d heads: %s') hint = _(b'%d heads: %s')

relnotes/next

debugstrip`. The extension remains for compatibility. debugstrip`. The extension remains for compatibility.
* `hg diff` now supports `--from <rev>` and `--to <rev>` arguments as * `hg diff` now supports `--from <rev>` and `--to <rev>` arguments as
clearer alternatives to `-r <revs>`. clearer alternatives to `-r <revs>`.
* The memory footprint per changeset during pull/unbundle * The memory footprint per changeset during pull/unbundle
operations has been further reduced. operations has been further reduced.
== New Experimental Features == == New Experimental Features ==
* `experimental.single-head-per-branch:public-changes-only` can be used
restrict the single head check to public revision. This is useful for
overlay repository that have both a publishing and non-publishing view
of the same storage.
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
== Internal API Changes == == Internal API Changes ==

tests/test-single-head.t

Because of previous test, we'll also push c_aL0 and c_aM0. Because of previous test, we'll also push c_aL0 and c_aM0.
$ hg out -T "{desc}\n" $ hg out -T "{desc}\n"
comparing with $TESTTMP/single-head-server comparing with $TESTTMP/single-head-server
searching for changes searching for changes
c_aL0 c_aL0
c_aM0 c_aM0
Let's make a new head and push everythin. The server feedback will mention Let's make a new head and push everything. The server feedback will mention
exactly one new head because c_aM0 is closed. exactly one new head because c_aM0 is closed.
$ hg up 'desc("c_aG0")' $ hg up 'desc("c_aG0")'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit c_aN0 $ mkcommit c_aN0
created new head created new head
$ hg push -f $ hg push -f
pushing to $TESTTMP/single-head-server pushing to $TESTTMP/single-head-server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads) added 3 changesets with 3 changes to 3 files (+1 heads)
$ cd ..
Test that singe-head-per-branch can be restricted to public changes
-------------------------------------------------------------------
$ hg clone -r 49003e504178 single-head-server public-only
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 9 files
1 new obsolescence markers
new changesets ea207398892e:49003e504178 (9 drafts)
updating to branch branch_A
9 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd public-only
$ cat <<EOF >> .hg/hgrc
> [phases]
> publish = no
> [experimental]
> single-head-per-branch = yes
> single-head-per-branch:public-changes-only = yes
> EOF
> hg phase -p :
$ hg update 'desc("c_aG0")'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit c_dO0
created new head
$ hg log -G
@ changeset: 9:8058fd35cc2b
| branch: branch_A
| tag: tip
| parent: 7:a33fb808fb4b
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: c_dO0
|
| o changeset: 8:49003e504178
|/| branch: branch_A
| | parent: 7:a33fb808fb4b
| | parent: 3:840af1c6bc88
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: c_aI0
| |
o | changeset: 7:a33fb808fb4b
| | branch: branch_A
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: c_aG0
| |
o | changeset: 6:99a2dc242c5d
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: c_dF1
| |
o | changeset: 5:6ed1df20edb1
|\ \ parent: 4:9bf953aa81f6
| | | parent: 2:286d02a6e2a2
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: c_dE0
| | |
| o | changeset: 4:9bf953aa81f6
| | | parent: 1:134bc3852ad2
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: c_dD0
| | |
| | o changeset: 3:840af1c6bc88
| | | branch: branch_A
| | | parent: 0:ea207398892e
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: c_aC0
| | |
o | | changeset: 2:286d02a6e2a2
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: c_dB0
| |
o | changeset: 1:134bc3852ad2
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: c_dA0
|
o changeset: 0:ea207398892e
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT
$ hg phase -p .
abort: rejecting multiple heads on branch "branch_A"
(2 heads: 49003e504178 8058fd35cc2b)
[255]