Mercurial > hg
view tests/test-bugzilla.t @ 44667:b561f3a68e41 stable
discovery: avoid wrongly saying there are nothing to pull
We can get in a situation where a revision passed through `hg pull --rev REV`
are available on the server, but not a descendant of the advertised server
heads.
For example the server could lying be during heads advertisement, to hide some
pull request. Or obsolete/hidden content could be explicitly pulled.
So in this case the lookup associated to `REV` returned successfully, but the
normal discovery will find all advertised heads already known locally. This flip
a special boolean `anyinc` that will prevent any fetch attempt, preventing `REV`
to be pulled over.
We add three line of code to detect this case and make sure a pull actually
happens.
My main target is to make some third party extensions happy (I expect the
associated test to move upstream with the extension). However this fix already
make some of the `infinitepush` test happier.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 06 Apr 2020 00:24:57 +0200 |
parents | 7370f302be71 |
children | 42d2b31cee0b |
line wrap: on
line source
mock bugzilla driver for testing template output: $ cat <<EOF > bzmock.py > from __future__ import absolute_import > from mercurial import extensions > from mercurial import pycompat > from mercurial import registrar > from mercurial.utils import stringutil > > configtable = {} > configitem = registrar.configitem(configtable) > > configitem(b'bugzilla', b'mocklog', > default=None, > ) > def extsetup(ui): > bugzilla = extensions.find(b'bugzilla') > class bzmock(bugzilla.bzaccess): > def __init__(self, ui): > super(bzmock, self).__init__(ui) > self._logfile = ui.config(b'bugzilla', b'mocklog') > def updatebug(self, bugid, newstate, text, committer): > with open(pycompat.fsdecode(self._logfile), 'ab') as f: > f.write(b'update bugid=%s, newstate=%s, committer=%s\n' > % (stringutil.pprint(bugid), > stringutil.pprint(newstate), > stringutil.pprint(committer))) > f.write(b'----\n' + text + b'\n----\n') > def notify(self, bugs, committer): > with open(pycompat.fsdecode(self._logfile), 'ab') as f: > f.write(b'notify bugs=%s, committer=%s\n' > % (stringutil.pprint(bugs), > stringutil.pprint(committer))) > bugzilla.bugzilla._versions[b'mock'] = bzmock > EOF set up mock repository: $ hg init mockremote $ cat <<EOF > mockremote/.hg/hgrc > [extensions] > bugzilla = > bzmock = $TESTTMP/bzmock.py > > [bugzilla] > version = mock > mocklog = $TESTTMP/bzmock.log > > [hooks] > incoming.bugzilla = python:hgext.bugzilla.hook > > [web] > baseurl=http://example.org/hg > > %include $TESTTMP/bzstyle.hgrc > EOF $ hg clone -q mockremote mocklocal push with default template: $ echo '[bugzilla]' > bzstyle.hgrc $ echo foo > mocklocal/foo $ hg ci -R mocklocal -Aqm 'Fixes bug 123' $ hg -R mocklocal push -q $ cat bzmock.log && rm bzmock.log update bugid=123, newstate={}, committer='test' ---- changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123. details: Fixes bug 123 ---- notify bugs={123: {}}, committer='test' push with style: $ cat <<EOF > bzstyle.map > changeset = "{node|short} refers to bug {bug}." > EOF $ echo "style = $TESTTMP/bzstyle.map" >> bzstyle.hgrc $ echo foo >> mocklocal/foo $ hg ci -R mocklocal -qm 'Fixes bug 456' $ hg -R mocklocal push -q $ cat bzmock.log && rm bzmock.log update bugid=456, newstate={}, committer='test' ---- 2808b172464b refers to bug 456. ---- notify bugs={456: {}}, committer='test' push with template (overrides style): $ cat <<EOF >> bzstyle.hgrc > template = Changeset {node|short} in {root|basename}. > {hgweb}/rev/{node|short}\n > {desc} > EOF $ echo foo >> mocklocal/foo $ hg ci -R mocklocal -qm 'Fixes bug 789' $ hg -R mocklocal push -q $ cat bzmock.log && rm bzmock.log update bugid=789, newstate={}, committer='test' ---- Changeset a770f3e409f2 in mockremote. http://example.org/hg/rev/a770f3e409f2 Fixes bug 789 ---- notify bugs={789: {}}, committer='test'