##// END OF EJS Templates
wireproto: split streamres into legacy and modern case...
wireproto: split streamres into legacy and modern case A couple of commands currently require transmission of uncompressed frames with the old MIME type. Split this case from streamres into a new streamres_legacy class. Streamline the remaining code accordingly. Add a new flag to streamres to request uncompressed streams. This is useful for sending data that is already compressed like a pre-built bundle. Expect clients to support uncompressed data. For older clients, zlib will still be used. Differential Revision: https://phab.mercurial-scm.org/D1862

File last commit:

r35331:0c1aff6d default
r35768:a39a9df7 default
Show More
phases.py
679 lines | 23.6 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
Gregory Szorc
phases: use absolute_import
r25966 from __future__ import absolute_import
Matt Mackall
phases: handle errors other than ENOENT appropriately
r15419 import errno
Boris Feld
phases: move binary encoding into a reusable function...
r34320 import struct
Gregory Szorc
phases: use absolute_import
r25966
from .i18n import _
from .node import (
bin,
hex,
nullid,
nullrev,
short,
)
from . import (
error,
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 pycompat,
Jun Wu
phases: add a getrevset method to phasecache...
r31016 smartset,
FUJIWARA Katsunori
phases: check HG_PENDING strictly...
r31053 txnutil,
Gregory Szorc
phases: emit phases to pushkey protocol in deterministic order...
r32000 util,
Gregory Szorc
phases: use absolute_import
r25966 )
Pierre-Yves David
phases: basic I/O logic...
r15418
Boris Feld
phases: move binary encoding into a reusable function...
r34320 _fphasesentry = struct.Struct('>i20s')
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: 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.
"""
Pierre-Yves David
clfilter: phases logic should be unfiltered...
r18002 repo = repo.unfiltered()
Patrick Mezard
phases: stop modifying localrepo in readroots()...
r16625 dirty = False
Pierre-Yves David
phases: basic I/O logic...
r15418 roots = [set() for i in allphases]
try:
FUJIWARA Katsunori
phases: check HG_PENDING strictly...
r31053 f, pending = txnutil.trypending(repo.root, repo.svfs, 'phaseroots')
Pierre-Yves David
phases: basic I/O logic...
r15418 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()
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Matt Mackall
phases: handle errors other than ENOENT appropriately
r15419 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
return roots, dirty
Pierre-Yves David
phases: basic I/O logic...
r15418
Boris Feld
phases: move binary encoding into a reusable function...
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
phases: move the binary decoding function in the phases module...
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
phases: track phase movements in 'advanceboundary'...
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
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)
Yuya Nishihara
phases: initialize number of loaded revisions to 0...
r35458 self._loadedrevslen = 0
Laurent Charignon
phases: add set per phase in C phase computation...
r25190 self._phasesets = None
Idan Kamara
phases: make _filterunknown a member function of phasecache...
r18220 self.filterunknown(repo)
Angel Ezquerra
localrepo: remove all external users of localrepo.sopener...
r23878 self.opener = repo.svfs
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658
Jun Wu
revset: use phasecache.getrevset to calculate public()...
r35331 def getrevset(self, repo, phases, subset=None):
Jun Wu
phases: add a getrevset method to phasecache...
r31016 """return a smartset for the given phases"""
self.loadphaserevs(repo) # ensure phase's sets are loaded
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 phases = set(phases)
if public not in phases:
# fast path: _phasesets contains the interesting sets,
# might only need a union and post-filtering.
if len(phases) == 1:
[p] = phases
revs = self._phasesets[p]
else:
revs = set.union(*[self._phasesets[p] for p in phases])
Jun Wu
phases: add a getrevset method to phasecache...
r31016 if repo.changelog.filteredrevs:
revs = revs - repo.changelog.filteredrevs
Jun Wu
revset: use phasecache.getrevset to calculate public()...
r35331 if subset is None:
return smartset.baseset(revs)
else:
return subset & smartset.baseset(revs)
Jun Wu
phases: add a getrevset method to phasecache...
r31016 else:
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 phases = set(allphases).difference(phases)
if not phases:
return smartset.fullreposet(repo)
if len(phases) == 1:
[p] = phases
revs = self._phasesets[p]
else:
revs = set.union(*[self._phasesets[p] for p in phases])
Jun Wu
revset: use phasecache.getrevset to calculate public()...
r35331 if subset is None:
subset = smartset.fullreposet(repo)
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 if not revs:
Jun Wu
revset: use phasecache.getrevset to calculate public()...
r35331 return subset
return subset.filter(lambda r: r not in revs)
Jun Wu
phases: add a getrevset method to phasecache...
r31016
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 def copy(self):
# Shallow copy meant to ensure isolation in
# advance/retractboundary(), nothing more.
Eric Sumner
bundlerepo: implement safe phasecache...
r23631 ph = self.__class__(None, None, _load=False)
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 ph.phaseroots = self.phaseroots[:]
ph.dirty = self.dirty
ph.opener = self.opener
Yuya Nishihara
phases: rename _phasemaxrev to _loadedrevslen to clarify it isn't max value...
r35457 ph._loadedrevslen = self._loadedrevslen
Pierre-Yves David
phase: also copy phase's sets when copying phase cache...
r25592 ph._phasesets = self._phasesets
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 return ph
def replace(self, phcache):
Pierre-Yves David
phase: document the replace method...
r25613 """replace all values in 'self' with content of phcache"""
Yuya Nishihara
phases: rename _phasemaxrev to _loadedrevslen to clarify it isn't max value...
r35457 for a in ('phaseroots', 'dirty', 'opener', '_loadedrevslen',
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 '_phasesets'):
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 setattr(self, a, getattr(phcache, a))
Patrick Mezard
phases: introduce phasecache...
r16657
Laurent Charignon
phases: make two functions private for phase computation
r24599 def _getphaserevsnative(self, repo):
Laurent Charignon
phase: default to C implementation for phase computation
r24444 repo = repo.unfiltered()
nativeroots = []
for phase in trackedphases:
nativeroots.append(map(repo.changelog.rev, self.phaseroots[phase]))
Pierre-Yves David
phases: really fix native phase computation...
r25527 return repo.changelog.computephases(nativeroots)
Laurent Charignon
phase: default to C implementation for phase computation
r24444
Laurent Charignon
phases: make two functions private for phase computation
r24599 def _computephaserevspure(self, repo):
Laurent Charignon
phases: move pure phase computation in a function
r24519 repo = repo.unfiltered()
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 cl = repo.changelog
self._phasesets = [set() for phase in allphases]
roots = pycompat.maplist(cl.rev, self.phaseroots[secret])
if roots:
ps = set(cl.descendants(roots))
for root in roots:
ps.add(root)
self._phasesets[secret] = ps
roots = pycompat.maplist(cl.rev, self.phaseroots[draft])
if roots:
ps = set(cl.descendants(roots))
for root in roots:
ps.add(root)
ps.difference_update(self._phasesets[secret])
self._phasesets[draft] = ps
Yuya Nishihara
phases: rename _phasemaxrev to _loadedrevslen to clarify it isn't max value...
r35457 self._loadedrevslen = len(cl)
Laurent Charignon
phases: move pure phase computation in a function
r24519
Pierre-Yves David
phase: rename getphaserevs to loadphaserevs...
r25611 def loadphaserevs(self, repo):
"""ensure phase information is loaded in the object"""
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 if self._phasesets is None:
Laurent Charignon
phase: default to C implementation for phase computation
r24444 try:
Jun Wu
phases: remove experimental.nativephaseskillswitch...
r31152 res = self._getphaserevsnative(repo)
Yuya Nishihara
phases: rename _phasemaxrev to _loadedrevslen to clarify it isn't max value...
r35457 self._loadedrevslen, self._phasesets = res
Laurent Charignon
phase: default to C implementation for phase computation
r24444 except AttributeError:
Laurent Charignon
phases: make two functions private for phase computation
r24599 self._computephaserevspure(repo)
Durham Goode
phases: move root phase assignment to it's own function...
r22894
Durham Goode
phases: add invalidate function...
r22893 def invalidate(self):
Yuya Nishihara
phases: initialize number of loaded revisions to 0...
r35458 self._loadedrevslen = 0
Pierre-Yves David
phase: invalidate the phase's set cache alongside the revs...
r25593 self._phasesets = None
Patrick Mezard
phases: introduce phasecache...
r16657
def phase(self, repo, rev):
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 # We need a repo argument here to be able to build _phasesets
Patrick Mezard
phases: introduce phasecache...
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
rebase: fix rebase aborts when 'tip-1' is public (issue4082)...
r19984 if rev < nullrev:
raise ValueError(_('cannot lookup negative revision'))
Yuya Nishihara
phases: rename _phasemaxrev to _loadedrevslen to clarify it isn't max value...
r35457 if rev >= self._loadedrevslen:
Durham Goode
phases: add invalidate function...
r22893 self.invalidate()
Pierre-Yves David
phase: rename getphaserevs to loadphaserevs...
r25611 self.loadphaserevs(repo)
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 for phase in trackedphases:
if rev in self._phasesets[phase]:
return phase
return public
Patrick Mezard
phases: introduce phasecache...
r16657
def write(self):
if not self.dirty:
return
FUJIWARA Katsunori
phases: make writing phaseroots file out avoid ambiguity of file stat...
r29303 f = self.opener('phaseroots', 'w', atomictemp=True, checkambig=True)
Patrick Mezard
phases: introduce phasecache...
r16657 try:
Pierre-Yves David
phase: extract the phaseroots serialization in a dedicated method...
r22079 self._write(f)
Patrick Mezard
phases: introduce phasecache...
r16657 finally:
f.close()
Pierre-Yves David
phase: extract the phaseroots serialization in a dedicated method...
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
phases: introduce phasecache...
r16657 self.dirty = False
Pierre-Yves David
phases: add a moveboundary function to move phases boundaries...
r15454
Pierre-Yves David
phase: attach phase to the transaction instead of the lock...
r22080 def _updateroots(self, phase, newroots, tr):
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 self.phaseroots[phase] = newroots
Durham Goode
phases: add invalidate function...
r22893 self.invalidate()
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 self.dirty = True
Pierre-Yves David
phase: attach phase to the transaction instead of the lock...
r22080 tr.addfilegenerator('phase', ('phaseroots',), self._write)
Pierre-Yves David
phases: inform transaction-related hooks that a phase was moved...
r22940 tr.hookargs['phases_moved'] = '1'
Pierre-Yves David
phase: attach phase to the transaction instead of the lock...
r22080
Boris Feld
phases: add a 'registernew' method to set new phases...
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
phase: add a transaction argument to advanceboundary...
r22069 def advanceboundary(self, repo, tr, targetphase, nodes):
Boris Feld
phases: extract the intermediate set of affected revs...
r33450 """Set all 'nodes' to phase 'targetphase'
Nodes with a phase lower than 'targetphase' are not affected.
"""
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 # Be careful to preserve shallow-copied values: do not update
# phaseroots values, replace them.
Boris Feld
phases: track phase movements in 'advanceboundary'...
r33451 if tr is None:
phasetracking = None
else:
phasetracking = tr.changes.get('phases')
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658
Pierre-Yves David
clfilter: phases logic should be unfiltered...
r18002 repo = repo.unfiltered()
Boris Feld
phases: track phase movements in 'advanceboundary'...
r33451
Patrick Mezard
phases: make advance/retractboundary() atomic...
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
phases: extract the intermediate set of affected revs...
r33450
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 olds = self.phaseroots[phase]
Boris Feld
phases: track phase movements in 'advanceboundary'...
r33451
Boris Feld
phases: extract the intermediate set of affected revs...
r33450 affected = repo.revs('%ln::%ln', olds, nodes)
Boris Feld
phases: track phase movements in 'advanceboundary'...
r33451 for r in affected:
_trackphasechange(phasetracking, r, self.phase(repo, r),
targetphase)
Boris Feld
phases: extract the intermediate set of affected revs...
r33450
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 roots = set(ctx.node() for ctx in repo.set(
Boris Feld
phases: extract the intermediate set of affected revs...
r33450 'roots((%ln::) - %ld)', olds, affected))
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 if olds != roots:
Pierre-Yves David
phase: attach phase to the transaction instead of the lock...
r22080 self._updateroots(phase, roots, tr)
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 # some roots may need to be declared for lower phases
delroots.extend(olds - roots)
Boris Feld
phase: put retractboundary out of the loop in advanceboundary...
r33449 # declare deleted root in the target phase
if targetphase != 0:
Boris Feld
phases: extract the core of boundary retraction in '_retractboundary'...
r33452 self._retractboundary(repo, tr, targetphase, delroots)
Pierre-Yves David
cache: group obscache and revsfiltercache invalidation in a single function...
r18105 repo.invalidatevolatilesets()
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658
Pierre-Yves David
phase: add a transaction argument to retractboundary...
r22070 def retractboundary(self, repo, tr, targetphase, nodes):
Boris Feld
phases: track phase changes from 'retractboundary'...
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
phases: extract the core of boundary retraction in '_retractboundary'...
r33452 repo.invalidatevolatilesets()
def _retractboundary(self, repo, tr, targetphase, nodes):
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 # Be careful to preserve shallow-copied values: do not update
# phaseroots values, replace them.
Pierre-Yves David
clfilter: phases logic should be unfiltered...
r18002 repo = repo.unfiltered()
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 currentroots = self.phaseroots[targetphase]
Boris Feld
phases: detect when boundaries has been actually retracted...
r33457 finalroots = oldroots = set(currentroots)
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 newroots = [n for n in nodes
if self.phase(repo, repo[n].rev()) < targetphase]
if newroots:
Boris Feld
phases: extract the core of boundary retraction in '_retractboundary'...
r33452
Patrick Mezard
phase: make if abort on nullid for the good reason...
r16659 if nullid in newroots:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('cannot change null revision phase'))
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 currentroots = currentroots.copy()
currentroots.update(newroots)
Durham Goode
phase: improve retractboundary perf...
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
phases: detect when boundaries has been actually retracted...
r33457 if finalroots != oldroots:
Durham Goode
phase: improve retractboundary perf...
r26909 self._updateroots(targetphase, finalroots, tr)
Boris Feld
phases: detect when boundaries has been actually retracted...
r33457 return True
return False
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658
Idan Kamara
phases: make _filterunknown a member function of phasecache...
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
phases: make order of debug output 'removing unknown node' deterministic
r20550 missing = sorted(node for node in nodes if node not in nodemap)
Idan Kamara
phases: make _filterunknown a member function of phasecache...
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
destroyed: invalidate phraserevs cache in all case (issue3858)...
r18983 # filterunknown is called by repo.destroyed, we may have no changes in
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 # root but _phasesets contents is certainly invalid (or at least we
Mads Kiilerich
spelling: random spell checker fixes
r19951 # have not proper way to check that). related to issue 3858.
Pierre-Yves David
destroyed: invalidate phraserevs cache in all case (issue3858)...
r18983 #
Joerg Sonnenberger
phases: drop the list with phase of each rev, always comput phase sets...
r35310 # The other caller is __init__ that have no _phasesets initialized
Pierre-Yves David
destroyed: invalidate phraserevs cache in all case (issue3858)...
r18983 # anyway. If this change we should consider adding a dedicated
Mads Kiilerich
spelling: random spell checker fixes
r19951 # "destroyed" function to phasecache or a proper cache key mechanism
Pierre-Yves David
destroyed: invalidate phraserevs cache in all case (issue3858)...
r18983 # (see branchmap one)
Durham Goode
phases: add invalidate function...
r22893 self.invalidate()
Idan Kamara
phases: make _filterunknown a member function of phasecache...
r18220
Pierre-Yves David
phase: add a transaction argument to advanceboundary...
r22069 def advanceboundary(repo, tr, 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()
Pierre-Yves David
phase: add a transaction argument to advanceboundary...
r22069 phcache.advanceboundary(repo, tr, targetphase, nodes)
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 repo._phasecache.replace(phcache)
Pierre-Yves David
phases: add retractboundary function to move boundary backward...
r15482
Pierre-Yves David
phase: add a transaction argument to retractboundary...
r22070 def retractboundary(repo, tr, 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()
Pierre-Yves David
phase: add a transaction argument to retractboundary...
r22070 phcache.retractboundary(repo, tr, targetphase, nodes)
Patrick Mezard
phases: make advance/retractboundary() atomic...
r16658 repo._phasecache.replace(phcache)
Pierre-Yves David
phases: add basic pushkey support
r15648
Boris Feld
phases: add a 'registernew' method to set new phases...
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
phases: add basic pushkey support
r15648 def listphases(repo):
Martin Geisler
phases: fix typos in docstrings
r16724 """List phases root for serialization over pushkey"""
Gregory Szorc
phases: emit phases to pushkey protocol in deterministic order...
r32000 # Use ordered dictionary so behavior is deterministic.
keys = util.sortdict()
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 value = '%i' % draft
Boris Feld
phase: filter out non-draft item in "draft root"...
r34817 cl = repo.unfiltered().changelog
Patrick Mezard
phases: introduce phasecache...
r16657 for root in repo._phasecache.phaseroots[draft]:
Boris Feld
phase: filter out non-draft item in "draft root"...
r34817 if repo._phasecache.phase(repo, cl.rev(root)) <= draft:
keys[hex(root)] = value
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892
Matt Mackall
publishing: use new helper method
r25624 if repo.publishing():
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):
timeless@mozdev.org
en-us: serialization
r17535 """List phases root for serialization over pushkey"""
Pierre-Yves David
clfilter: phases logic should be unfiltered...
r18002 repo = repo.unfiltered()
Bryan O'Sullivan
with: use context manager for lock in pushphase
r27861 with repo.lock():
Pierre-Yves David
phases: add basic pushkey support
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
with: use context manager for transaction in pushphase
r27874 with repo.transaction('pushkey-phase') as tr:
Bryan O'Sullivan
with: use context manager for lock in pushphase
r27861 advanceboundary(repo, tr, newphase, [bin(nhex)])
Martin von Zweigbergk
pushkey: use False/True for return values from push functions...
r32822 return True
Matt Mackall
phases: don't complain if cset is already public on pushkey (issue3230)
r16051 elif currentphase == newphase:
# raced, but got correct result
Martin von Zweigbergk
pushkey: use False/True for return values from push functions...
r32822 return True
Pierre-Yves David
phases: add basic pushkey support
r15648 else:
Martin von Zweigbergk
pushkey: use False/True for return values from push functions...
r32822 return False
Pierre-Yves David
phases: add a function to compute heads from root
r15649
Martin von Zweigbergk
bundle: add config option to include phases...
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
bundle2: only grab a transaction when 'phase-heads' affect the repository...
r34322 def updatephases(repo, trgetter, headsbyphase):
Martin von Zweigbergk
bundle: add config option to include phases...
r33031 """Updates the repo with the given phase heads"""
# Now advance phase boundaries of all but secret phase
Boris Feld
bundle2: only grab a transaction when 'phase-heads' affect the repository...
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
bundle: add config option to include phases...
r33031 for phase in allphases[:-1]:
Boris Feld
bundle2: only grab a transaction when 'phase-heads' affect the repository...
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
bundle: add config option to include phases...
r33031
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
"""
Pierre-Yves David
clfilter: phases logic should be unfiltered...
r18002 repo = repo.unfiltered()
Pierre-Yves David
phases: add a function to compute heads from root
r15649 # 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)
Gregory Szorc
phases: use constants for phase values...
r28174 if phase == public:
Pierre-Yves David
phases: simplify phase exchange and movement over pushkey...
r15892 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)
Gregory Szorc
phases: use constants for phase values...
r28174 elif phase == draft:
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
Boris Feld
phase: gather remote phase information in a summary object...
r34820 class remotephasessummary(object):
"""summarize phase information on the remote side
:publishing: True is the remote is publishing
:publicheads: list of remote public phase heads (nodes)
:draftheads: list of remote draft phase heads (nodes)
:draftroots: list of remote draft phase root (nodes)
"""
def __init__(self, repo, remotesubset, remoteroots):
unfi = repo.unfiltered()
self._allremoteroots = remoteroots
self.publishing = remoteroots.get('publishing', False)
ana = analyzeremotephases(repo, remotesubset, remoteroots)
self.publicheads, self.draftroots = ana
# Get the list of all "heads" revs draft on remote
dheads = unfi.set('heads(%ln::%ln)', self.draftroots, remotesubset)
self.draftheads = [c.node() for c in dheads]
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
Mads Kiilerich
fix wording and not-completely-trivial spelling errors and bad docstrings
r17425 * `roots`: define the second we subtract from the first"""
Pierre-Yves David
clfilter: phases logic should be unfiltered...
r18002 repo = repo.unfiltered()
Pierre-Yves David
phase: extracts heads computation logics from analyzeremotephases
r15954 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.
"""
Boris Feld
configitems: update default value of 'phases.new-commit'...
r34564 v = ui.config('phases', 'new-commit')
Pierre-Yves David
phases: allow phase name in phases.new-commit settings...
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
clfilter: introduce a `hassecret` function...
r17671 def hassecret(repo):
"""utility function that check if a repo have any secret changeset."""
return bool(repo._phasecache.phaseroots[2])
Boris Feld
phase: add a dedicated txnclose-phase hook...
r34711
def preparehookargs(node, old, new):
if old is None:
old = ''
else:
Kevin Bullock
phases: pass phase names to hooks instead of internal values
r34877 old = phasenames[old]
Boris Feld
phase: add a dedicated txnclose-phase hook...
r34711 return {'node': node,
'oldphase': old,
Kevin Bullock
phases: pass phase names to hooks instead of internal values
r34877 'phase': phasenames[new]}