This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10948

exchange: use "served" repo filter to guess what the server will publish
ClosedPublic

Authored by av6 on Jul 3 2021, 4:13 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf03e9d30258e: exchange: use "served" repo filter to guess what the server will publish
Summary

Previously, the second push in the added test would say "push would publish 2
changesets" because _checkpublish() was considering secret changesets to be
"pushable" when push command had a --rev argument.

Without --rev argument to push command, we already filter the repo properly.

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

av6 created this revision.Jul 3 2021, 4:13 AM
pulkit accepted this revision.Jul 3 2021, 2:28 PM
This revision is now accepted and ready to land.Jul 3 2021, 2:28 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (4 lines)
Mtests/test-phases-exchange.t (20 lines)

Diff 28767

mercurial/exchange.py

remotephases = listkeys(pushop.remote, b'phases') remotephases = listkeys(pushop.remote, b'phases')
if not remotephases.get(b'publishing', False): if not remotephases.get(b'publishing', False):
return return
if pushop.revs is None: if pushop.revs is None:
published = repo.filtered(b'served').revs(b'not public()') published = repo.filtered(b'served').revs(b'not public()')
else: else:
published = repo.revs(b'::%ln - public()', pushop.revs) published = repo.revs(b'::%ln - public()', pushop.revs)
# we want to use pushop.revs in the revset even if they themselves are
# secret, but we don't want to have anything that the server won't see
# in the result of this expression
published &= repo.filtered(b'served')
if published: if published:
if behavior == b'warn': if behavior == b'warn':
ui.warn( ui.warn(
_(b'%i changesets about to be published\n') % len(published) _(b'%i changesets about to be published\n') % len(published)
) )
elif behavior == b'confirm': elif behavior == b'confirm':
if ui.promptchoice( if ui.promptchoice(
_(b'push and publish %i changesets (yn)?$$ &Yes $$ &No') _(b'push and publish %i changesets (yn)?$$ &Yes $$ &No')

tests/test-phases-exchange.t

(use --publish or adjust 'experimental.auto-publish' config) (use --publish or adjust 'experimental.auto-publish' config)
[255] [255]
$ hg push -r '.^' --config experimental.auto-publish=abort $ hg push -r '.^' --config experimental.auto-publish=abort
pushing to $TESTTMP/auto-publish-orig pushing to $TESTTMP/auto-publish-orig
abort: push would publish 1 changesets abort: push would publish 1 changesets
(use --publish or adjust 'experimental.auto-publish' config) (use --publish or adjust 'experimental.auto-publish' config)
[255] [255]
trying to push a secret changeset doesn't confuse auto-publish
$ hg phase --secret --force
test-debug-phase: move rev 0: 1 -> 2
test-debug-phase: move rev 1: 1 -> 2
$ hg push --config experimental.auto-publish=abort
pushing to $TESTTMP/auto-publish-orig
abort: push would publish 1 changesets
(use --publish or adjust 'experimental.auto-publish' config)
[255]
$ hg push -r . --config experimental.auto-publish=abort
pushing to $TESTTMP/auto-publish-orig
abort: push would publish 1 changesets
(use --publish or adjust 'experimental.auto-publish' config)
[255]
$ hg phase --draft
test-debug-phase: move rev 1: 2 -> 1
--publish flag makes push succeed --publish flag makes push succeed
$ hg push -r '.^' --publish --config experimental.auto-publish=abort $ hg push -r '.^' --publish --config experimental.auto-publish=abort
pushing to $TESTTMP/auto-publish-orig pushing to $TESTTMP/auto-publish-orig
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes