diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -1840,7 +1840,7 @@ def handlepushkey(op, inpart): def handlephases(op, inpart): """apply phases from bundle part to repo""" headsbyphase = phases.binarydecode(inpart) - phases.updatephases(op.repo.unfiltered(), op.gettransaction(), headsbyphase) + phases.updatephases(op.repo.unfiltered(), op.gettransaction, headsbyphase) op.records.add('phase-heads', {}) @parthandler('reply:pushkey', ('return', 'in-reply-to')) diff --git a/mercurial/phases.py b/mercurial/phases.py --- a/mercurial/phases.py +++ b/mercurial/phases.py @@ -558,11 +558,18 @@ def subsetphaseheads(repo, subset): headsbyphase[phase] = [cl.node(r) for r in repo.revs(revset, subset)] return headsbyphase -def updatephases(repo, tr, headsbyphase): +def updatephases(repo, trgetter, headsbyphase): """Updates the repo with the given phase heads""" # Now advance phase boundaries of all but secret phase + # + # run the update (and fetch transaction) only if there are actually things + # to update. This avoid creating empty transaction during no-op operation. + for phase in allphases[:-1]: - advanceboundary(repo, tr, phase, headsbyphase[phase]) + revset = '%%ln - %s()' % phasenames[phase] + heads = [c.node() for c in repo.set(revset, headsbyphase[phase])] + if heads: + advanceboundary(repo, trgetter(), phase, heads) def analyzeremotephases(repo, subset, roots): """Compute phases heads and root in a subset of node from root dict