phases.py
643 lines
| 22.3 KiB
| text/x-python
|
PythonLexer
/ mercurial / phases.py
Pierre-Yves David
|
r15659 | """ Mercurial phases support code | ||
--- | ||||
Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> | ||||
Logilab SA <contact@logilab.fr> | ||||
Augie Fackler <durin42@gmail.com> | ||||
Martin Geisler
|
r16725 | This software may be used and distributed according to the terms | ||
of the GNU General Public License version 2 or any later version. | ||||
Pierre-Yves David
|
r15659 | |||
--- | ||||
This module implements most phase logic in mercurial. | ||||
Basic Concept | ||||
============= | ||||
Martin Geisler
|
r16724 | A 'changeset phase' is an indicator that tells us how a changeset is | ||
Martin Geisler
|
r16725 | manipulated and communicated. The details of each phase is described | ||
below, here we describe the properties they have in common. | ||||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16725 | Like bookmarks, phases are not stored in history and thus are not | ||
permanent and leave no audit trail. | ||||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16725 | First, no changeset can be in two phases at once. Phases are ordered, | ||
so they can be considered from lowest to highest. The default, lowest | ||||
phase is 'public' - this is the normal phase of existing changesets. A | ||||
child changeset can not be in a lower phase than its parents. | ||||
Pierre-Yves David
|
r15659 | |||
These phases share a hierarchy of traits: | ||||
immutable shared | ||||
public: X X | ||||
draft: X | ||||
Pierre-Yves David
|
r15705 | secret: | ||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16724 | Local commits are draft by default. | ||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16724 | Phase Movement and Exchange | ||
=========================== | ||||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16725 | Phase data is exchanged by pushkey on pull and push. Some servers have | ||
a publish option set, we call such a server a "publishing server". | ||||
Pushing a draft changeset to a publishing server changes the phase to | ||||
public. | ||||
Pierre-Yves David
|
r15659 | |||
A small list of fact/rules define the exchange of phase: | ||||
* old client never changes server states | ||||
* pull never changes server states | ||||
Martin Geisler
|
r16724 | * publish and old server changesets are seen as public by client | ||
Martin Geisler
|
r16725 | * any secret changeset seen in another repository is lowered to at | ||
least draft | ||||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16725 | Here is the final table summing up the 49 possible use cases of phase | ||
exchange: | ||||
Pierre-Yves David
|
r15659 | |||
server | ||||
old publish non-publish | ||||
N X N D P N D P | ||||
old client | ||||
pull | ||||
N - X/X - X/D X/P - X/D X/P | ||||
X - X/X - X/D X/P - X/D X/P | ||||
push | ||||
X X/X X/X X/P X/P X/P X/D X/D X/P | ||||
new client | ||||
pull | ||||
N - P/X - P/D P/P - D/D P/P | ||||
D - P/X - P/D P/P - D/D P/P | ||||
P - P/X - P/D P/P - P/D P/P | ||||
push | ||||
D P/X P/X P/P P/P P/P D/D D/D P/P | ||||
P P/X P/X P/P P/P P/P P/P P/P P/P | ||||
Legend: | ||||
A/B = final state on client / state on server | ||||
* N = new/not present, | ||||
* P = public, | ||||
* D = draft, | ||||
Martin Geisler
|
r16725 | * X = not tracked (i.e., the old client or server has no internal | ||
way of recording the phase.) | ||||
Pierre-Yves David
|
r15659 | |||
passive = only pushes | ||||
A cell here can be read like this: | ||||
Martin Geisler
|
r16725 | "When a new client pushes a draft changeset (D) to a publishing | ||
server where it's not present (N), it's marked public on both | ||||
sides (P/P)." | ||||
Pierre-Yves David
|
r15659 | |||
Martin Geisler
|
r16724 | Note: old client behave as a publishing server with draft only content | ||
Pierre-Yves David
|
r15659 | - other people see it as public | ||
- content is pushed as draft | ||||
""" | ||||
Pierre-Yves David
|
r15417 | |||
Gregory Szorc
|
r25966 | from __future__ import absolute_import | ||
Matt Mackall
|
r15419 | import errno | ||
Boris Feld
|
r34320 | import struct | ||
Gregory Szorc
|
r25966 | |||
from .i18n import _ | ||||
from .node import ( | ||||
bin, | ||||
hex, | ||||
nullid, | ||||
nullrev, | ||||
short, | ||||
) | ||||
from . import ( | ||||
error, | ||||
Jun Wu
|
r31016 | smartset, | ||
FUJIWARA Katsunori
|
r31053 | txnutil, | ||
Gregory Szorc
|
r32000 | util, | ||
Gregory Szorc
|
r25966 | ) | ||
Pierre-Yves David
|
r15418 | |||
Boris Feld
|
r34320 | _fphasesentry = struct.Struct('>i20s') | ||
Pierre-Yves David
|
r15818 | allphases = public, draft, secret = range(3) | ||
Pierre-Yves David
|
r15417 | trackedphases = allphases[1:] | ||
Pierre-Yves David
|
r15821 | phasenames = ['public', 'draft', 'secret'] | ||
Pierre-Yves David
|
r15418 | |||
Patrick Mezard
|
r16657 | def _readroots(repo, phasedefaults=None): | ||
Patrick Mezard
|
r16625 | """Read phase roots from disk | ||
phasedefaults is a list of fn(repo, roots) callable, which are | ||||
executed if the phase roots file does not exist. When phases are | ||||
being initialized on an existing repository, this could be used to | ||||
set selected changesets phase to something else than public. | ||||
Return (roots, dirty) where dirty is true if roots differ from | ||||
what is being stored. | ||||
""" | ||||
Pierre-Yves David
|
r18002 | repo = repo.unfiltered() | ||
Patrick Mezard
|
r16625 | dirty = False | ||
Pierre-Yves David
|
r15418 | roots = [set() for i in allphases] | ||
try: | ||||
FUJIWARA Katsunori
|
r31053 | f, pending = txnutil.trypending(repo.root, repo.svfs, 'phaseroots') | ||
Pierre-Yves David
|
r15418 | try: | ||
for line in f: | ||||
Martin Geisler
|
r16588 | phase, nh = line.split() | ||
Pierre-Yves David
|
r15418 | roots[int(phase)].add(bin(nh)) | ||
finally: | ||||
f.close() | ||||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Matt Mackall
|
r15419 | if inst.errno != errno.ENOENT: | ||
raise | ||||
Patrick Mezard
|
r16625 | if phasedefaults: | ||
for f in phasedefaults: | ||||
roots = f(repo, roots) | ||||
dirty = True | ||||
return roots, dirty | ||||
Pierre-Yves David
|
r15418 | |||
Boris Feld
|
r34320 | def binaryencode(phasemapping): | ||
"""encode a 'phase -> nodes' mapping into a binary stream | ||||
Since phases are integer the mapping is actually a python list: | ||||
[[PUBLIC_HEADS], [DRAFTS_HEADS], [SECRET_HEADS]] | ||||
""" | ||||
binarydata = [] | ||||
for phase, nodes in enumerate(phasemapping): | ||||
for head in nodes: | ||||
binarydata.append(_fphasesentry.pack(phase, head)) | ||||
return ''.join(binarydata) | ||||
Boris Feld
|
r34321 | def binarydecode(stream): | ||
"""decode a binary stream into a 'phase -> nodes' mapping | ||||
Since phases are integer the mapping is actually a python list.""" | ||||
headsbyphase = [[] for i in allphases] | ||||
entrysize = _fphasesentry.size | ||||
while True: | ||||
entry = stream.read(entrysize) | ||||
if len(entry) < entrysize: | ||||
if entry: | ||||
raise error.Abort(_('bad phase-heads stream')) | ||||
break | ||||
phase, node = _fphasesentry.unpack(entry) | ||||
headsbyphase[phase].append(node) | ||||
return headsbyphase | ||||
Boris Feld
|
r33451 | def _trackphasechange(data, rev, old, new): | ||
"""add a phase move the <data> dictionnary | ||||
If data is None, nothing happens. | ||||
""" | ||||
if data is None: | ||||
return | ||||
existing = data.get(rev) | ||||
if existing is not None: | ||||
old = existing[0] | ||||
data[rev] = (old, new) | ||||
Patrick Mezard
|
r16657 | class phasecache(object): | ||
Patrick Mezard
|
r16658 | def __init__(self, repo, phasedefaults, _load=True): | ||
if _load: | ||||
# Cheap trick to allow shallow-copy without copy module | ||||
self.phaseroots, self.dirty = _readroots(repo, phasedefaults) | ||||
Idan Kamara
|
r18220 | self._phaserevs = None | ||
Laurent Charignon
|
r25190 | self._phasesets = None | ||
Idan Kamara
|
r18220 | self.filterunknown(repo) | ||
Angel Ezquerra
|
r23878 | self.opener = repo.svfs | ||
Patrick Mezard
|
r16658 | |||
Jun Wu
|
r31016 | def getrevset(self, repo, phases): | ||
"""return a smartset for the given phases""" | ||||
self.loadphaserevs(repo) # ensure phase's sets are loaded | ||||
if self._phasesets and all(self._phasesets[p] is not None | ||||
for p in phases): | ||||
# fast path - use _phasesets | ||||
revs = self._phasesets[phases[0]] | ||||
if len(phases) > 1: | ||||
revs = revs.copy() # only copy when needed | ||||
for p in phases[1:]: | ||||
revs.update(self._phasesets[p]) | ||||
if repo.changelog.filteredrevs: | ||||
revs = revs - repo.changelog.filteredrevs | ||||
return smartset.baseset(revs) | ||||
else: | ||||
# slow path - enumerate all revisions | ||||
phase = self.phase | ||||
revs = (r for r in repo if phase(repo, r) in phases) | ||||
return smartset.generatorset(revs, iterasc=True) | ||||
Patrick Mezard
|
r16658 | def copy(self): | ||
# Shallow copy meant to ensure isolation in | ||||
# advance/retractboundary(), nothing more. | ||||
Eric Sumner
|
r23631 | ph = self.__class__(None, None, _load=False) | ||
Patrick Mezard
|
r16658 | ph.phaseroots = self.phaseroots[:] | ||
ph.dirty = self.dirty | ||||
ph.opener = self.opener | ||||
ph._phaserevs = self._phaserevs | ||||
Pierre-Yves David
|
r25592 | ph._phasesets = self._phasesets | ||
Patrick Mezard
|
r16658 | return ph | ||
def replace(self, phcache): | ||||
Pierre-Yves David
|
r25613 | """replace all values in 'self' with content of phcache""" | ||
Pierre-Yves David
|
r25614 | for a in ('phaseroots', 'dirty', 'opener', '_phaserevs', '_phasesets'): | ||
Patrick Mezard
|
r16658 | setattr(self, a, getattr(phcache, a)) | ||
Patrick Mezard
|
r16657 | |||
Laurent Charignon
|
r24599 | def _getphaserevsnative(self, repo): | ||
Laurent Charignon
|
r24444 | repo = repo.unfiltered() | ||
nativeroots = [] | ||||
for phase in trackedphases: | ||||
nativeroots.append(map(repo.changelog.rev, self.phaseroots[phase])) | ||||
Pierre-Yves David
|
r25527 | return repo.changelog.computephases(nativeroots) | ||
Laurent Charignon
|
r24444 | |||
Laurent Charignon
|
r24599 | def _computephaserevspure(self, repo): | ||
Laurent Charignon
|
r24519 | repo = repo.unfiltered() | ||
revs = [public] * len(repo.changelog) | ||||
self._phaserevs = revs | ||||
self._populatephaseroots(repo) | ||||
for phase in trackedphases: | ||||
Augie Fackler
|
r31342 | roots = list(map(repo.changelog.rev, self.phaseroots[phase])) | ||
Laurent Charignon
|
r24519 | if roots: | ||
for rev in roots: | ||||
revs[rev] = phase | ||||
for rev in repo.changelog.descendants(roots): | ||||
revs[rev] = phase | ||||
Pierre-Yves David
|
r25611 | def loadphaserevs(self, repo): | ||
"""ensure phase information is loaded in the object""" | ||||
Durham Goode
|
r22893 | if self._phaserevs is None: | ||
Laurent Charignon
|
r24444 | try: | ||
Jun Wu
|
r31152 | res = self._getphaserevsnative(repo) | ||
self._phaserevs, self._phasesets = res | ||||
Laurent Charignon
|
r24444 | except AttributeError: | ||
Laurent Charignon
|
r24599 | self._computephaserevspure(repo) | ||
Durham Goode
|
r22894 | |||
Durham Goode
|
r22893 | def invalidate(self): | ||
self._phaserevs = None | ||||
Pierre-Yves David
|
r25593 | self._phasesets = None | ||
Patrick Mezard
|
r16657 | |||
Durham Goode
|
r22894 | def _populatephaseroots(self, repo): | ||
"""Fills the _phaserevs cache with phases for the roots. | ||||
""" | ||||
cl = repo.changelog | ||||
phaserevs = self._phaserevs | ||||
for phase in trackedphases: | ||||
roots = map(cl.rev, self.phaseroots[phase]) | ||||
for root in roots: | ||||
phaserevs[root] = phase | ||||
Patrick Mezard
|
r16657 | def phase(self, repo, rev): | ||
Mads Kiilerich
|
r17424 | # We need a repo argument here to be able to build _phaserevs | ||
Patrick Mezard
|
r16657 | # if necessary. The repository instance is not stored in | ||
# phasecache to avoid reference cycles. The changelog instance | ||||
# is not stored because it is a filecache() property and can | ||||
# be replaced without us being notified. | ||||
if rev == nullrev: | ||||
return public | ||||
Durham Goode
|
r19984 | if rev < nullrev: | ||
raise ValueError(_('cannot lookup negative revision')) | ||||
Patrick Mezard
|
r16657 | if self._phaserevs is None or rev >= len(self._phaserevs): | ||
Durham Goode
|
r22893 | self.invalidate() | ||
Pierre-Yves David
|
r25611 | self.loadphaserevs(repo) | ||
Patrick Mezard
|
r16657 | return self._phaserevs[rev] | ||
def write(self): | ||||
if not self.dirty: | ||||
return | ||||
FUJIWARA Katsunori
|
r29303 | f = self.opener('phaseroots', 'w', atomictemp=True, checkambig=True) | ||
Patrick Mezard
|
r16657 | try: | ||
Pierre-Yves David
|
r22079 | self._write(f) | ||
Patrick Mezard
|
r16657 | finally: | ||
f.close() | ||||
Pierre-Yves David
|
r22079 | |||
def _write(self, fp): | ||||
for phase, roots in enumerate(self.phaseroots): | ||||
for h in roots: | ||||
fp.write('%i %s\n' % (phase, hex(h))) | ||||
Patrick Mezard
|
r16657 | self.dirty = False | ||
Pierre-Yves David
|
r15454 | |||
Pierre-Yves David
|
r22080 | def _updateroots(self, phase, newroots, tr): | ||
Patrick Mezard
|
r16658 | self.phaseroots[phase] = newroots | ||
Durham Goode
|
r22893 | self.invalidate() | ||
Patrick Mezard
|
r16658 | self.dirty = True | ||
Pierre-Yves David
|
r22080 | tr.addfilegenerator('phase', ('phaseroots',), self._write) | ||
Pierre-Yves David
|
r22940 | tr.hookargs['phases_moved'] = '1' | ||
Pierre-Yves David
|
r22080 | |||
Boris Feld
|
r33453 | def registernew(self, repo, tr, targetphase, nodes): | ||
repo = repo.unfiltered() | ||||
self._retractboundary(repo, tr, targetphase, nodes) | ||||
if tr is not None and 'phases' in tr.changes: | ||||
phasetracking = tr.changes['phases'] | ||||
torev = repo.changelog.rev | ||||
phase = self.phase | ||||
for n in nodes: | ||||
rev = torev(n) | ||||
revphase = phase(repo, rev) | ||||
_trackphasechange(phasetracking, rev, None, revphase) | ||||
repo.invalidatevolatilesets() | ||||
Pierre-Yves David
|
r22069 | def advanceboundary(self, repo, tr, targetphase, nodes): | ||
Boris Feld
|
r33450 | """Set all 'nodes' to phase 'targetphase' | ||
Nodes with a phase lower than 'targetphase' are not affected. | ||||
""" | ||||
Patrick Mezard
|
r16658 | # Be careful to preserve shallow-copied values: do not update | ||
# phaseroots values, replace them. | ||||
Boris Feld
|
r33451 | if tr is None: | ||
phasetracking = None | ||||
else: | ||||
phasetracking = tr.changes.get('phases') | ||||
Patrick Mezard
|
r16658 | |||
Pierre-Yves David
|
r18002 | repo = repo.unfiltered() | ||
Boris Feld
|
r33451 | |||
Patrick Mezard
|
r16658 | delroots = [] # set of root deleted by this path | ||
for phase in xrange(targetphase + 1, len(allphases)): | ||||
# filter nodes that are not in a compatible phase already | ||||
nodes = [n for n in nodes | ||||
if self.phase(repo, repo[n].rev()) >= phase] | ||||
if not nodes: | ||||
break # no roots to move anymore | ||||
Boris Feld
|
r33450 | |||
Patrick Mezard
|
r16658 | olds = self.phaseroots[phase] | ||
Boris Feld
|
r33451 | |||
Boris Feld
|
r33450 | affected = repo.revs('%ln::%ln', olds, nodes) | ||
Boris Feld
|
r33451 | for r in affected: | ||
_trackphasechange(phasetracking, r, self.phase(repo, r), | ||||
targetphase) | ||||
Boris Feld
|
r33450 | |||
Patrick Mezard
|
r16658 | roots = set(ctx.node() for ctx in repo.set( | ||
Boris Feld
|
r33450 | 'roots((%ln::) - %ld)', olds, affected)) | ||
Patrick Mezard
|
r16658 | if olds != roots: | ||
Pierre-Yves David
|
r22080 | self._updateroots(phase, roots, tr) | ||
Patrick Mezard
|
r16658 | # some roots may need to be declared for lower phases | ||
delroots.extend(olds - roots) | ||||
Boris Feld
|
r33449 | # declare deleted root in the target phase | ||
if targetphase != 0: | ||||
Boris Feld
|
r33452 | self._retractboundary(repo, tr, targetphase, delroots) | ||
Pierre-Yves David
|
r18105 | repo.invalidatevolatilesets() | ||
Patrick Mezard
|
r16658 | |||
Pierre-Yves David
|
r22070 | def retractboundary(self, repo, tr, targetphase, nodes): | ||
Boris Feld
|
r33458 | oldroots = self.phaseroots[:targetphase + 1] | ||
if tr is None: | ||||
phasetracking = None | ||||
else: | ||||
phasetracking = tr.changes.get('phases') | ||||
repo = repo.unfiltered() | ||||
if (self._retractboundary(repo, tr, targetphase, nodes) | ||||
and phasetracking is not None): | ||||
# find the affected revisions | ||||
new = self.phaseroots[targetphase] | ||||
old = oldroots[targetphase] | ||||
affected = set(repo.revs('(%ln::) - (%ln::)', new, old)) | ||||
# find the phase of the affected revision | ||||
for phase in xrange(targetphase, -1, -1): | ||||
if phase: | ||||
roots = oldroots[phase] | ||||
revs = set(repo.revs('%ln::%ld', roots, affected)) | ||||
affected -= revs | ||||
else: # public phase | ||||
revs = affected | ||||
for r in revs: | ||||
_trackphasechange(phasetracking, r, phase, targetphase) | ||||
Boris Feld
|
r33452 | repo.invalidatevolatilesets() | ||
def _retractboundary(self, repo, tr, targetphase, nodes): | ||||
Patrick Mezard
|
r16658 | # Be careful to preserve shallow-copied values: do not update | ||
# phaseroots values, replace them. | ||||
Pierre-Yves David
|
r18002 | repo = repo.unfiltered() | ||
Patrick Mezard
|
r16658 | currentroots = self.phaseroots[targetphase] | ||
Boris Feld
|
r33457 | finalroots = oldroots = set(currentroots) | ||
Patrick Mezard
|
r16658 | newroots = [n for n in nodes | ||
if self.phase(repo, repo[n].rev()) < targetphase] | ||||
if newroots: | ||||
Boris Feld
|
r33452 | |||
Patrick Mezard
|
r16659 | if nullid in newroots: | ||
Pierre-Yves David
|
r26587 | raise error.Abort(_('cannot change null revision phase')) | ||
Patrick Mezard
|
r16658 | currentroots = currentroots.copy() | ||
currentroots.update(newroots) | ||||
Durham Goode
|
r26909 | |||
# Only compute new roots for revs above the roots that are being | ||||
# retracted. | ||||
minnewroot = min(repo[n].rev() for n in newroots) | ||||
aboveroots = [n for n in currentroots | ||||
if repo[n].rev() >= minnewroot] | ||||
updatedroots = repo.set('roots(%ln::)', aboveroots) | ||||
finalroots = set(n for n in currentroots if repo[n].rev() < | ||||
minnewroot) | ||||
finalroots.update(ctx.node() for ctx in updatedroots) | ||||
Boris Feld
|
r33457 | if finalroots != oldroots: | ||
Durham Goode
|
r26909 | self._updateroots(targetphase, finalroots, tr) | ||
Boris Feld
|
r33457 | return True | ||
return False | ||||
Patrick Mezard
|
r16658 | |||
Idan Kamara
|
r18220 | def filterunknown(self, repo): | ||
"""remove unknown nodes from the phase boundary | ||||
Nothing is lost as unknown nodes only hold data for their descendants. | ||||
""" | ||||
filtered = False | ||||
nodemap = repo.changelog.nodemap # to filter unknown nodes | ||||
for phase, nodes in enumerate(self.phaseroots): | ||||
Mads Kiilerich
|
r20550 | missing = sorted(node for node in nodes if node not in nodemap) | ||
Idan Kamara
|
r18220 | if missing: | ||
for mnode in missing: | ||||
repo.ui.debug( | ||||
'removing unknown node %s from %i-phase boundary\n' | ||||
% (short(mnode), phase)) | ||||
nodes.symmetric_difference_update(missing) | ||||
filtered = True | ||||
if filtered: | ||||
self.dirty = True | ||||
Pierre-Yves David
|
r18983 | # filterunknown is called by repo.destroyed, we may have no changes in | ||
Mads Kiilerich
|
r19951 | # root but phaserevs contents is certainly invalid (or at least we | ||
# have not proper way to check that). related to issue 3858. | ||||
Pierre-Yves David
|
r18983 | # | ||
# The other caller is __init__ that have no _phaserevs initialized | ||||
# anyway. If this change we should consider adding a dedicated | ||||
Mads Kiilerich
|
r19951 | # "destroyed" function to phasecache or a proper cache key mechanism | ||
Pierre-Yves David
|
r18983 | # (see branchmap one) | ||
Durham Goode
|
r22893 | self.invalidate() | ||
Idan Kamara
|
r18220 | |||
Pierre-Yves David
|
r22069 | def advanceboundary(repo, tr, targetphase, nodes): | ||
Pierre-Yves David
|
r15454 | """Add nodes to a phase changing other nodes phases if necessary. | ||
Martin Geisler
|
r16725 | This function move boundary *forward* this means that all nodes | ||
are set in the target phase or kept in a *lower* phase. | ||||
Pierre-Yves David
|
r15454 | |||
Pierre-Yves David
|
r15482 | Simplify boundary to contains phase roots only.""" | ||
Patrick Mezard
|
r16658 | phcache = repo._phasecache.copy() | ||
Pierre-Yves David
|
r22069 | phcache.advanceboundary(repo, tr, targetphase, nodes) | ||
Patrick Mezard
|
r16658 | repo._phasecache.replace(phcache) | ||
Pierre-Yves David
|
r15482 | |||
Pierre-Yves David
|
r22070 | def retractboundary(repo, tr, targetphase, nodes): | ||
Martin Geisler
|
r16725 | """Set nodes back to a phase changing other nodes phases if | ||
necessary. | ||||
Pierre-Yves David
|
r15482 | |||
Martin Geisler
|
r16725 | This function move boundary *backward* this means that all nodes | ||
are set in the target phase or kept in a *higher* phase. | ||||
Pierre-Yves David
|
r15482 | |||
Simplify boundary to contains phase roots only.""" | ||||
Patrick Mezard
|
r16658 | phcache = repo._phasecache.copy() | ||
Pierre-Yves David
|
r22070 | phcache.retractboundary(repo, tr, targetphase, nodes) | ||
Patrick Mezard
|
r16658 | repo._phasecache.replace(phcache) | ||
Pierre-Yves David
|
r15648 | |||
Boris Feld
|
r33453 | def registernew(repo, tr, targetphase, nodes): | ||
"""register a new revision and its phase | ||||
Code adding revisions to the repository should use this function to | ||||
set new changeset in their target phase (or higher). | ||||
""" | ||||
phcache = repo._phasecache.copy() | ||||
phcache.registernew(repo, tr, targetphase, nodes) | ||||
repo._phasecache.replace(phcache) | ||||
Pierre-Yves David
|
r15648 | def listphases(repo): | ||
Martin Geisler
|
r16724 | """List phases root for serialization over pushkey""" | ||
Gregory Szorc
|
r32000 | # Use ordered dictionary so behavior is deterministic. | ||
keys = util.sortdict() | ||||
Pierre-Yves David
|
r15892 | value = '%i' % draft | ||
Patrick Mezard
|
r16657 | for root in repo._phasecache.phaseroots[draft]: | ||
Pierre-Yves David
|
r15892 | keys[hex(root)] = value | ||
Matt Mackall
|
r25624 | if repo.publishing(): | ||
Martin Geisler
|
r16725 | # Add an extra data to let remote know we are a publishing | ||
# repo. Publishing repo can't just pretend they are old repo. | ||||
# When pushing to a publishing repo, the client still need to | ||||
# push phase boundary | ||||
Pierre-Yves David
|
r15648 | # | ||
Martin Geisler
|
r16725 | # Push do not only push changeset. It also push phase data. | ||
# New phase data may apply to common changeset which won't be | ||||
# push (as they are common). Here is a very simple example: | ||||
Pierre-Yves David
|
r15648 | # | ||
# 1) repo A push changeset X as draft to repo B | ||||
# 2) repo B make changeset X public | ||||
Martin Geisler
|
r16725 | # 3) repo B push to repo A. X is not pushed but the data that | ||
# X as now public should | ||||
Pierre-Yves David
|
r15648 | # | ||
Martin Geisler
|
r16725 | # The server can't handle it on it's own as it has no idea of | ||
# client phase data. | ||||
Pierre-Yves David
|
r15648 | keys['publishing'] = 'True' | ||
return keys | ||||
def pushphase(repo, nhex, oldphasestr, newphasestr): | ||||
timeless@mozdev.org
|
r17535 | """List phases root for serialization over pushkey""" | ||
Pierre-Yves David
|
r18002 | repo = repo.unfiltered() | ||
Bryan O'Sullivan
|
r27861 | with repo.lock(): | ||
Pierre-Yves David
|
r15648 | currentphase = repo[nhex].phase() | ||
newphase = abs(int(newphasestr)) # let's avoid negative index surprise | ||||
oldphase = abs(int(oldphasestr)) # let's avoid negative index surprise | ||||
if currentphase == oldphase and newphase < oldphase: | ||||
Bryan O'Sullivan
|
r27874 | with repo.transaction('pushkey-phase') as tr: | ||
Bryan O'Sullivan
|
r27861 | advanceboundary(repo, tr, newphase, [bin(nhex)]) | ||
Martin von Zweigbergk
|
r32822 | return True | ||
Matt Mackall
|
r16051 | elif currentphase == newphase: | ||
# raced, but got correct result | ||||
Martin von Zweigbergk
|
r32822 | return True | ||
Pierre-Yves David
|
r15648 | else: | ||
Martin von Zweigbergk
|
r32822 | return False | ||
Pierre-Yves David
|
r15649 | |||
Martin von Zweigbergk
|
r33031 | def subsetphaseheads(repo, subset): | ||
"""Finds the phase heads for a subset of a history | ||||
Returns a list indexed by phase number where each item is a list of phase | ||||
head nodes. | ||||
""" | ||||
cl = repo.changelog | ||||
headsbyphase = [[] for i in allphases] | ||||
# No need to keep track of secret phase; any heads in the subset that | ||||
# are not mentioned are implicitly secret. | ||||
for phase in allphases[:-1]: | ||||
revset = "heads(%%ln & %s())" % phasenames[phase] | ||||
headsbyphase[phase] = [cl.node(r) for r in repo.revs(revset, subset)] | ||||
return headsbyphase | ||||
Boris Feld
|
r34322 | def updatephases(repo, trgetter, headsbyphase): | ||
Martin von Zweigbergk
|
r33031 | """Updates the repo with the given phase heads""" | ||
# Now advance phase boundaries of all but secret phase | ||||
Boris Feld
|
r34322 | # | ||
# run the update (and fetch transaction) only if there are actually things | ||||
# to update. This avoid creating empty transaction during no-op operation. | ||||
Martin von Zweigbergk
|
r33031 | for phase in allphases[:-1]: | ||
Boris Feld
|
r34322 | revset = '%%ln - %s()' % phasenames[phase] | ||
heads = [c.node() for c in repo.set(revset, headsbyphase[phase])] | ||||
if heads: | ||||
advanceboundary(repo, trgetter(), phase, heads) | ||||
Martin von Zweigbergk
|
r33031 | |||
Pierre-Yves David
|
r15649 | def analyzeremotephases(repo, subset, roots): | ||
"""Compute phases heads and root in a subset of node from root dict | ||||
* subset is heads of the subset | ||||
* roots is {<nodeid> => phase} mapping. key and value are string. | ||||
Accept unknown element input | ||||
""" | ||||
Pierre-Yves David
|
r18002 | repo = repo.unfiltered() | ||
Pierre-Yves David
|
r15649 | # build list from dictionary | ||
Pierre-Yves David
|
r15892 | draftroots = [] | ||
Sune Foldager
|
r15902 | nodemap = repo.changelog.nodemap # to filter unknown nodes | ||
Pierre-Yves David
|
r15649 | for nhex, phase in roots.iteritems(): | ||
if nhex == 'publishing': # ignore data related to publish option | ||||
continue | ||||
node = bin(nhex) | ||||
phase = int(phase) | ||||
Gregory Szorc
|
r28174 | if phase == public: | ||
Pierre-Yves David
|
r15892 | if node != nullid: | ||
Pierre-Yves David
|
r15953 | repo.ui.warn(_('ignoring inconsistent public root' | ||
' from remote: %s\n') % nhex) | ||||
Gregory Szorc
|
r28174 | elif phase == draft: | ||
Sune Foldager
|
r15902 | if node in nodemap: | ||
Pierre-Yves David
|
r15892 | draftroots.append(node) | ||
else: | ||||
Pierre-Yves David
|
r15953 | repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n') | ||
% (phase, nhex)) | ||||
Pierre-Yves David
|
r15649 | # compute heads | ||
Pierre-Yves David
|
r15954 | publicheads = newheads(repo, subset, draftroots) | ||
Pierre-Yves David
|
r15892 | return publicheads, draftroots | ||
Pierre-Yves David
|
r15649 | |||
Pierre-Yves David
|
r15954 | def newheads(repo, heads, roots): | ||
"""compute new head of a subset minus another | ||||
* `heads`: define the first subset | ||||
Mads Kiilerich
|
r17425 | * `roots`: define the second we subtract from the first""" | ||
Pierre-Yves David
|
r18002 | repo = repo.unfiltered() | ||
Pierre-Yves David
|
r15954 | revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))', | ||
heads, roots, roots, heads) | ||||
return [c.node() for c in revset] | ||||
Pierre-Yves David
|
r16030 | |||
def newcommitphase(ui): | ||||
"""helper to get the target phase of new commit | ||||
Handle all possible values for the phases.new-commit options. | ||||
""" | ||||
Boris Feld
|
r34564 | v = ui.config('phases', 'new-commit') | ||
Pierre-Yves David
|
r16030 | try: | ||
return phasenames.index(v) | ||||
except ValueError: | ||||
try: | ||||
return int(v) | ||||
except ValueError: | ||||
msg = _("phases.new-commit: not a valid phase name ('%s')") | ||||
raise error.ConfigError(msg % v) | ||||
Pierre-Yves David
|
r17671 | def hassecret(repo): | ||
"""utility function that check if a repo have any secret changeset.""" | ||||
return bool(repo._phasecache.phaseroots[2]) | ||||
Boris Feld
|
r34711 | |||
def preparehookargs(node, old, new): | ||||
if old is None: | ||||
old = '' | ||||
else: | ||||
old = '%s' % old | ||||
return {'node': node, | ||||
'oldphase': old, | ||||
'phase': '%s' % new} | ||||