##// END OF EJS Templates
pushkey: do not exchange obsole markers if feature is disabled...
pushkey: do not exchange obsole markers if feature is disabled This apply to both push and pull both when client or server.

File last commit:

r17205:97eff000 default
r17298:59c14bf5 stable
Show More
phases.py
387 lines | 13.4 KiB | text/x-python | PythonLexer
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
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
phases: wrap docstrings at 70 characters
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
phases: change publish behavior to only alter behavior when server....
r15659
---
This module implements most phase logic in mercurial.
Basic Concept
=============
Martin Geisler
phases: fix typos in docstrings
r16724 A 'changeset phase' is an indicator that tells us how a changeset is
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 manipulated and communicated. The details of each phase is described
below, here we describe the properties they have in common.
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 Like bookmarks, phases are not stored in history and thus are not
permanent and leave no audit trail.
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: change publish behavior to only alter behavior when server....
r15659
These phases share a hierarchy of traits:
immutable shared
public: X X
draft: X
Pierre-Yves David
phases: update doc to mention secret phase
r15705 secret:
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: fix typos in docstrings
r16724 Local commits are draft by default.
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: fix typos in docstrings
r16724 Phase Movement and Exchange
===========================
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: change publish behavior to only alter behavior when server....
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
phases: fix typos in docstrings
r16724 * publish and old server changesets are seen as public by client
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 * any secret changeset seen in another repository is lowered to at
least draft
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 Here is the final table summing up the 49 possible use cases of phase
exchange:
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
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
phases: wrap docstrings at 70 characters
r16725 * X = not tracked (i.e., the old client or server has no internal
way of recording the phase.)
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659
passive = only pushes
A cell here can be read like this:
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: change publish behavior to only alter behavior when server....
r15659
Martin Geisler
phases: fix typos in docstrings
r16724 Note: old client behave as a publishing server with draft only content
Pierre-Yves David
phases: change publish behavior to only alter behavior when server....
r15659 - other people see it as public
- content is pushed as draft
"""
Pierre-Yves David
phases: Minimal first add.
r15417
Matt Mackall
phases: handle errors other than ENOENT appropriately
r15419 import errno
Patrick Mezard
phases: introduce phasecache...
r16657 from node import nullid, nullrev, bin, hex, short
Pierre-Yves David
phases: handle unknown nodes in boundary...
r15456 from i18n import _
Patrick Mezard
phase: make if abort on nullid for the good reason...
r16659 import util
Pierre-Yves David
phases: basic I/O logic...
r15418
Pierre-Yves David
phases: store phase values in constant instead of using raw integer...
r15818 allphases = public, draft, secret = range(3)
Pierre-Yves David
phases: Minimal first add.
r15417 trackedphases = allphases[1:]
Pierre-Yves David
phases: add list of string to access phase name
r15821 phasenames = ['public', 'draft', 'secret']
Pierre-Yves David
phases: basic I/O logic...
r15418
Patrick Mezard
phases: call filterunknown() in readroots()...
r16624 def _filterunknown(ui, changelog, phaseroots):
"""remove unknown nodes from the phase boundary
Martin Geisler
phases: fix typos in docstrings
r16724 Nothing is lost as unknown nodes only hold data for their descendants.
Patrick Mezard
phases: call filterunknown() in readroots()...
r16624 """
updated = False
nodemap = changelog.nodemap # to filter unknown nodes
for phase, nodes in enumerate(phaseroots):
missing = [node for node in nodes if node not in nodemap]
if missing:
for mnode in missing:
ui.debug(
'removing unknown node %s from %i-phase boundary\n'
% (short(mnode), phase))
nodes.symmetric_difference_update(missing)
updated = True
return updated
Patrick Mezard
phases: introduce phasecache...
r16657 def _readroots(repo, phasedefaults=None):
Patrick Mezard
phases: stop modifying localrepo in readroots()...
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.
"""
dirty = False
Pierre-Yves David
phases: basic I/O logic...
r15418 roots = [set() for i in allphases]
try:
f = repo.sopener('phaseroots')
try:
for line in f:
Martin Geisler
phases: line.strip().split() == line.split()
r16588 phase, nh = line.split()
Pierre-Yves David
phases: basic I/O logic...
r15418 roots[int(phase)].add(bin(nh))
finally:
f.close()
Matt Mackall
phases: handle errors other than ENOENT appropriately
r15419 except IOError, inst:
if inst.errno != errno.ENOENT:
raise
Patrick Mezard
phases: stop modifying localrepo in readroots()...
r16625 if phasedefaults:
for f in phasedefaults:
roots = f(repo, roots)
dirty = True
Patrick Mezard
phases: call filterunknown() in readroots()...
r16624 if _filterunknown(repo.ui, repo.changelog, roots):
Patrick Mezard
phases: stop modifying localrepo in readroots()...
r16625 dirty = True
return roots, dirty
Pierre-Yves David
phases: basic I/O logic...
r15418
Patrick Mezard
phases: introduce phasecache...
r16657 class phasecache(object):
Patrick Mezard
phases: make advance/retractboundary() atomic...
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)
self.opener = repo.sopener
self._phaserevs = None
def copy(self):
# Shallow copy meant to ensure isolation in
# advance/retractboundary(), nothing more.
ph = phasecache(None, None, _load=False)
ph.phaseroots = self.phaseroots[:]
ph.dirty = self.dirty
ph.opener = self.opener
ph._phaserevs = self._phaserevs
return ph
def replace(self, phcache):
for a in 'phaseroots dirty opener _phaserevs'.split():
setattr(self, a, getattr(phcache, a))
Patrick Mezard
phases: introduce phasecache...
r16657
def getphaserevs(self, repo, rebuild=False):
if rebuild or self._phaserevs is None:
revs = [public] * len(repo.changelog)
for phase in trackedphases:
roots = map(repo.changelog.rev, self.phaseroots[phase])
if roots:
for rev in roots:
revs[rev] = phase
Bryan O'Sullivan
revlog: descendants(*revs) becomes descendants(revs) (API)...
r16867 for rev in repo.changelog.descendants(roots):
Patrick Mezard
phases: introduce phasecache...
r16657 revs[rev] = phase
self._phaserevs = revs
return self._phaserevs
def phase(self, repo, rev):
# We need a repo argument here to be able to build _phaserev
# 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
if self._phaserevs is None or rev >= len(self._phaserevs):
self._phaserevs = self.getphaserevs(repo, rebuild=True)
return self._phaserevs[rev]
def write(self):
if not self.dirty:
return
f = self.opener('phaseroots', 'w', atomictemp=True)
try:
for phase, roots in enumerate(self.phaseroots):
for h in roots:
f.write('%i %s\n' % (phase, hex(h)))
finally:
f.close()
self.dirty = False
Pierre-Yves David
phases: add a moveboundary function to move phases boundaries...
r15454
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 def _updateroots(self, phase, newroots):
self.phaseroots[phase] = newroots
self._phaserevs = None
self.dirty = True
def advanceboundary(self, repo, targetphase, nodes):
# Be careful to preserve shallow-copied values: do not update
# phaseroots values, replace them.
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
olds = self.phaseroots[phase]
roots = set(ctx.node() for ctx in repo.set(
'roots((%ln::) - (%ln::%ln))', olds, olds, nodes))
if olds != roots:
self._updateroots(phase, roots)
# some roots may need to be declared for lower phases
delroots.extend(olds - roots)
# declare deleted root in the target phase
if targetphase != 0:
self.retractboundary(repo, targetphase, delroots)
def retractboundary(self, repo, targetphase, nodes):
# Be careful to preserve shallow-copied values: do not update
# phaseroots values, replace them.
currentroots = self.phaseroots[targetphase]
newroots = [n for n in nodes
if self.phase(repo, repo[n].rev()) < targetphase]
if newroots:
Patrick Mezard
phase: make if abort on nullid for the good reason...
r16659 if nullid in newroots:
raise util.Abort(_('cannot change null revision phase'))
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 currentroots = currentroots.copy()
currentroots.update(newroots)
ctxs = repo.set('roots(%ln::)', currentroots)
currentroots.intersection_update(ctx.node() for ctx in ctxs)
self._updateroots(targetphase, currentroots)
Pierre-Yves David
phases: rename moveboundary into advance boundary...
r15481 def advanceboundary(repo, targetphase, nodes):
Pierre-Yves David
phases: add a moveboundary function to move phases boundaries...
r15454 """Add nodes to a phase changing other nodes phases if necessary.
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: add a moveboundary function to move phases boundaries...
r15454
Pierre-Yves David
phases: add retractboundary function to move boundary backward...
r15482 Simplify boundary to contains phase roots only."""
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 phcache = repo._phasecache.copy()
phcache.advanceboundary(repo, targetphase, nodes)
repo._phasecache.replace(phcache)
Pierre-Yves David
phases: add retractboundary function to move boundary backward...
r15482
def retractboundary(repo, targetphase, nodes):
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 """Set nodes back to a phase changing other nodes phases if
necessary.
Pierre-Yves David
phases: add retractboundary function to move boundary backward...
r15482
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: add retractboundary function to move boundary backward...
r15482
Simplify boundary to contains phase roots only."""
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 phcache = repo._phasecache.copy()
phcache.retractboundary(repo, targetphase, nodes)
repo._phasecache.replace(phcache)
Pierre-Yves David
phases: add basic pushkey support
r15648
def listphases(repo):
Martin Geisler
phases: fix typos in docstrings
r16724 """List phases root for serialization over pushkey"""
Pierre-Yves David
phases: add basic pushkey support
r15648 keys = {}
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 value = '%i' % draft
Patrick Mezard
phases: introduce phasecache...
r16657 for root in repo._phasecache.phaseroots[draft]:
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 keys[hex(root)] = value
Pierre-Yves David
phases: add basic pushkey support
r15648 if repo.ui.configbool('phases', 'publish', True):
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: add basic pushkey support
r15648 #
Martin Geisler
phases: wrap docstrings at 70 characters
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
phases: add basic pushkey support
r15648 #
# 1) repo A push changeset X as draft to repo B
# 2) repo B make changeset X public
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 # 3) repo B push to repo A. X is not pushed but the data that
# X as now public should
Pierre-Yves David
phases: add basic pushkey support
r15648 #
Martin Geisler
phases: wrap docstrings at 70 characters
r16725 # The server can't handle it on it's own as it has no idea of
# client phase data.
Pierre-Yves David
phases: add basic pushkey support
r15648 keys['publishing'] = 'True'
return keys
def pushphase(repo, nhex, oldphasestr, newphasestr):
"""List phases root for serialisation over pushkey"""
lock = repo.lock()
try:
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:
advanceboundary(repo, newphase, [bin(nhex)])
return 1
Matt Mackall
phases: don't complain if cset is already public on pushkey (issue3230)
r16051 elif currentphase == newphase:
# raced, but got correct result
return 1
Pierre-Yves David
phases: add basic pushkey support
r15648 else:
return 0
finally:
lock.release()
Pierre-Yves David
phases: add a function to compute heads from root
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
"""
# build list from dictionary
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 draftroots = []
Sune Foldager
phases: use nodemap to check for missing nodes
r15902 nodemap = repo.changelog.nodemap # to filter unknown nodes
Pierre-Yves David
phases: add a function to compute heads from root
r15649 for nhex, phase in roots.iteritems():
if nhex == 'publishing': # ignore data related to publish option
continue
node = bin(nhex)
phase = int(phase)
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 if phase == 0:
if node != nullid:
Pierre-Yves David
phase: fix warning text from invalid remote phase...
r15953 repo.ui.warn(_('ignoring inconsistent public root'
' from remote: %s\n') % nhex)
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 elif phase == 1:
Sune Foldager
phases: use nodemap to check for missing nodes
r15902 if node in nodemap:
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 draftroots.append(node)
else:
Pierre-Yves David
phase: fix warning text from invalid remote phase...
r15953 repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n')
% (phase, nhex))
Pierre-Yves David
phases: add a function to compute heads from root
r15649 # compute heads
Pierre-Yves David
phase: extracts heads computation logics from analyzeremotephases
r15954 publicheads = newheads(repo, subset, draftroots)
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 return publicheads, draftroots
Pierre-Yves David
phases: add a function to compute heads from root
r15649
Pierre-Yves David
phase: extracts heads computation logics from analyzeremotephases
r15954 def newheads(repo, heads, roots):
"""compute new head of a subset minus another
* `heads`: define the first subset
* `rroots`: define the second we substract to the first"""
revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))',
heads, roots, roots, heads)
return [c.node() for c in revset]
Pierre-Yves David
phases: allow phase name in phases.new-commit settings...
r16030
def newcommitphase(ui):
"""helper to get the target phase of new commit
Handle all possible values for the phases.new-commit options.
"""
v = ui.config('phases', 'new-commit', draft)
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)