phase: add an archived phase

This phase allows for hidden changesets in the "user space". It differs from
the "internal" phase which is intended for internal by-product only. There
have been discussions at the 4.8 sprint to use such phase to speedup cleanup
after history rewriting operation.

Shipping it in the same release as the 'internal-phase' groups the associated
`requires` entry. The important bit is to have support for this phase in the
earliest version of mercurial possible. Adding the UI to manipulate this new
phase later seems fine.

The current plan for archived usage and user interface are as follow. On a
repository with internal-phase on and evolution off:

* history rewriting command set rewritten changeset in the archived phase.
  (This mean updating the cleanupnodes method).
* keep `hg unbundle .hg/strip-backup/X.hg` as a way to restore changeset for
  now
  (backup bundle need to contains phase data)
* [maybe] add a `hg strip --soft` advance flag
  (a light way to expose the feature without getting in the way of a better
  UI)

Mercurial 4.8 freeze is too close to get the above in by then.

We don't introduce a new repository `requirement` as we reuse the one
introduced with the 'archived' phase during the 4.8 cycle.

mercurial/phases.py

@@ -1,741 +1,744 b''
 """ Mercurial phases support code
 
     ---
 
     Copyright 2011 Pierre-Yves David <[e-mail]>
                    Logilab SA        <[e-mail]>
                    Augie Fackler     <[e-mail]>
 
     This software may be used and distributed according to the terms
     of the GNU General Public License version 2 or any later version.
 
     ---
 
 This module implements most phase logic in mercurial.
 
 
 Basic Concept
 =============
 
 A 'changeset phase' is an indicator that tells us how a changeset is
 manipulated and communicated. The details of each phase is described
 below, here we describe the properties they have in common.
 
 Like bookmarks, phases are not stored in history and thus are not
 permanent and leave no audit trail.
 
 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.
 
 These phases share a hierarchy of traits:
 
             immutable shared
     public:     X        X
     draft:               X
     secret:
 
 Local commits are draft by default.
 
 Phase Movement and Exchange
 ===========================
 
 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.
 
 A small list of fact/rules define the exchange of phase:
 
 * old client never changes server states
 * pull never changes server states
 * publish and old server changesets are seen as public by client
 * any secret changeset seen in another repository is lowered to at
   least draft
 
 Here is the final table summing up the 49 possible use cases of phase
 exchange:
 
                            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,
     * X = not tracked (i.e., the old client or server has no internal
           way of recording the phase.)
 
     passive = only pushes
 
 
     A cell here can be read like this:
 
     "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)."
 
 Note: old client behave as a publishing server with draft only content
 - other people see it as public
 - content is pushed as draft
 
 """
 
 from __future__ import absolute_import
 
 import errno
 import struct
 
 from .i18n import _
 from .node import (
     bin,
     hex,
     nullid,
     nullrev,
     short,
 )
 from . import (
     error,
     pycompat,
     smartset,
     txnutil,
     util,
 )
 
 _fphasesentry = struct.Struct('>i20s')
 
 INTERNAL_FLAG = 64 # Phases for mercurial internal usage only
 HIDEABLE_FLAG = 32 # Phases that are hideable
 
 # record phase index
 public, draft, secret = range(3)
 internal = INTERNAL_FLAG | HIDEABLE_FLAG
+archived = HIDEABLE_FLAG
 allphases = range(internal + 1)
 trackedphases = allphases[1:]
 # record phase names
 phasenames = [None] * len(allphases)
 phasenames[:3] = ['public', 'draft', 'secret']
+phasenames[archived] = 'archived'
 phasenames[internal] = 'internal'
 # record phase property
 mutablephases = tuple(allphases[1:])
 remotehiddenphases = tuple(allphases[2:])
 localhiddenphases = tuple(p for p in allphases if p & HIDEABLE_FLAG)
 
 def supportinternal(repo):
     """True if the internal phase can be used on a repository"""
     return 'internal-phase' in repo.requirements
 
 def _readroots(repo, phasedefaults=None):
     """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.
     """
     repo = repo.unfiltered()
     dirty = False
     roots = [set() for i in allphases]
     try:
         f, pending = txnutil.trypending(repo.root, repo.svfs, 'phaseroots')
         try:
             for line in f:
                 phase, nh = line.split()
                 roots[int(phase)].add(bin(nh))
         finally:
             f.close()
     except IOError as inst:
         if inst.errno != errno.ENOENT:
             raise
         if phasedefaults:
             for f in phasedefaults:
                 roots = f(repo, roots)
         dirty = True
     return roots, dirty
 
 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)
 
 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
 
 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)
 
 class phasecache(object):
     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._loadedrevslen = 0
             self._phasesets = None
             self.filterunknown(repo)
             self.opener = repo.svfs
 
     def getrevset(self, repo, phases, subset=None):
         """return a smartset for the given phases"""
         self.loadphaserevs(repo) # ensure phase's sets are loaded
         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])
             if repo.changelog.filteredrevs:
                 revs = revs - repo.changelog.filteredrevs
             if subset is None:
                 return smartset.baseset(revs)
             else:
                 return subset & smartset.baseset(revs)
         else:
             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])
             if subset is None:
                 subset = smartset.fullreposet(repo)
             if not revs:
                 return subset
             return subset.filter(lambda r: r not in revs)
 
     def copy(self):
         # Shallow copy meant to ensure isolation in
         # advance/retractboundary(), nothing more.
         ph = self.__class__(None, None, _load=False)
         ph.phaseroots = self.phaseroots[:]
         ph.dirty = self.dirty
         ph.opener = self.opener
         ph._loadedrevslen = self._loadedrevslen
         ph._phasesets = self._phasesets
         return ph
 
     def replace(self, phcache):
         """replace all values in 'self' with content of phcache"""
         for a in ('phaseroots', 'dirty', 'opener', '_loadedrevslen',
                   '_phasesets'):
             setattr(self, a, getattr(phcache, a))
 
     def _getphaserevsnative(self, repo):
         repo = repo.unfiltered()
         nativeroots = []
         for phase in trackedphases:
             nativeroots.append(pycompat.maplist(repo.changelog.rev,
                                                 self.phaseroots[phase]))
         return repo.changelog.computephases(nativeroots)
 
     def _computephaserevspure(self, repo):
         repo = repo.unfiltered()
         cl = repo.changelog
         self._phasesets = [set() for phase in allphases]
         lowerroots = set()
         for phase in reversed(trackedphases):
             roots = pycompat.maplist(cl.rev, self.phaseroots[phase])
             if roots:
                 ps = set(cl.descendants(roots))
                 for root in roots:
                     ps.add(root)
                 ps.difference_update(lowerroots)
                 lowerroots.update(ps)
                 self._phasesets[phase] = ps
         self._loadedrevslen = len(cl)
 
     def loadphaserevs(self, repo):
         """ensure phase information is loaded in the object"""
         if self._phasesets is None:
             try:
                 res = self._getphaserevsnative(repo)
                 self._loadedrevslen, self._phasesets = res
             except AttributeError:
                 self._computephaserevspure(repo)
 
     def invalidate(self):
         self._loadedrevslen = 0
         self._phasesets = None
 
     def phase(self, repo, rev):
         # We need a repo argument here to be able to build _phasesets
         # 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 rev < nullrev:
             raise ValueError(_('cannot lookup negative revision'))
         if rev >= self._loadedrevslen:
             self.invalidate()
             self.loadphaserevs(repo)
         for phase in trackedphases:
             if rev in self._phasesets[phase]:
                 return phase
         return public
 
     def write(self):
         if not self.dirty:
             return
         f = self.opener('phaseroots', 'w', atomictemp=True, checkambig=True)
         try:
             self._write(f)
         finally:
             f.close()
 
     def _write(self, fp):
         for phase, roots in enumerate(self.phaseroots):
             for h in sorted(roots):
                 fp.write('%i %s\n' % (phase, hex(h)))
         self.dirty = False
 
     def _updateroots(self, phase, newroots, tr):
         self.phaseroots[phase] = newroots
         self.invalidate()
         self.dirty = True
 
         tr.addfilegenerator('phase', ('phaseroots',), self._write)
         tr.hookargs['phases_moved'] = '1'
 
     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()
 
     def advanceboundary(self, repo, tr, targetphase, nodes, dryrun=None):
         """Set all 'nodes' to phase 'targetphase'
 
         Nodes with a phase lower than 'targetphase' are not affected.
 
         If dryrun is True, no actions will be performed
 
         Returns a set of revs whose phase is changed or should be changed
         """
         # Be careful to preserve shallow-copied values: do not update
         # phaseroots values, replace them.
         if tr is None:
             phasetracking = None
         else:
             phasetracking = tr.changes.get('phases')
 
         repo = repo.unfiltered()
 
         changes = set() # set of revisions to be changed
         delroots = [] # set of root deleted by this path
         for phase in pycompat.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]
 
             affected = repo.revs('%ln::%ln', olds, nodes)
             changes.update(affected)
             if dryrun:
                 continue
             for r in affected:
                 _trackphasechange(phasetracking, r, self.phase(repo, r),
                                   targetphase)
 
             roots = set(ctx.node() for ctx in repo.set(
                     'roots((%ln::) - %ld)', olds, affected))
             if olds != roots:
                 self._updateroots(phase, roots, tr)
                 # some roots may need to be declared for lower phases
                 delroots.extend(olds - roots)
         if not dryrun:
             # declare deleted root in the target phase
             if targetphase != 0:
                 self._retractboundary(repo, tr, targetphase, delroots)
             repo.invalidatevolatilesets()
         return changes
 
     def retractboundary(self, repo, tr, targetphase, nodes):
         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 pycompat.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)
         repo.invalidatevolatilesets()
 
     def _retractboundary(self, repo, tr, targetphase, nodes):
         # Be careful to preserve shallow-copied values: do not update
         # phaseroots values, replace them.
-        if targetphase == internal and not supportinternal(repo):
-            msg = 'this repository does not support the internal phase'
+        if targetphase in (archived, internal) and not supportinternal(repo):
+            name = phasenames[targetphase]
+            msg = 'this repository does not support the %s phase' % name
             raise error.ProgrammingError(msg)
 
         repo = repo.unfiltered()
         currentroots = self.phaseroots[targetphase]
         finalroots = oldroots = set(currentroots)
         newroots = [n for n in nodes
                     if self.phase(repo, repo[n].rev()) < targetphase]
         if newroots:
 
             if nullid in newroots:
                 raise error.Abort(_('cannot change null revision phase'))
             currentroots = currentroots.copy()
             currentroots.update(newroots)
 
             # 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)
         if finalroots != oldroots:
             self._updateroots(targetphase, finalroots, tr)
             return True
         return False
 
     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):
             missing = sorted(node for node in nodes if node not in nodemap)
             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
         # filterunknown is called by repo.destroyed, we may have no changes in
         # root but _phasesets contents is certainly invalid (or at least we
         # have not proper way to check that). related to issue 3858.
         #
         # The other caller is __init__ that have no _phasesets initialized
         # anyway. If this change we should consider adding a dedicated
         # "destroyed" function to phasecache or a proper cache key mechanism
         # (see branchmap one)
         self.invalidate()
 
 def advanceboundary(repo, tr, targetphase, nodes, dryrun=None):
     """Add nodes to a phase changing other nodes phases if necessary.
 
     This function move boundary *forward* this means that all nodes
     are set in the target phase or kept in a *lower* phase.
 
     Simplify boundary to contains phase roots only.
 
     If dryrun is True, no actions will be performed
 
     Returns a set of revs whose phase is changed or should be changed
     """
     phcache = repo._phasecache.copy()
     changes = phcache.advanceboundary(repo, tr, targetphase, nodes,
                                       dryrun=dryrun)
     if not dryrun:
         repo._phasecache.replace(phcache)
     return changes
 
 def retractboundary(repo, tr, targetphase, nodes):
     """Set nodes back to a phase changing other nodes phases if
     necessary.
 
     This function move boundary *backward* this means that all nodes
     are set in the target phase or kept in a *higher* phase.
 
     Simplify boundary to contains phase roots only."""
     phcache = repo._phasecache.copy()
     phcache.retractboundary(repo, tr, targetphase, nodes)
     repo._phasecache.replace(phcache)
 
 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)
 
 def listphases(repo):
     """List phases root for serialization over pushkey"""
     # Use ordered dictionary so behavior is deterministic.
     keys = util.sortdict()
     value = '%i' % draft
     cl = repo.unfiltered().changelog
     for root in repo._phasecache.phaseroots[draft]:
         if repo._phasecache.phase(repo, cl.rev(root)) <= draft:
             keys[hex(root)] = value
 
     if repo.publishing():
         # 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
         #
         # 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:
         #
         # 1) repo A push changeset X as draft to repo B
         # 2) repo B make changeset X public
         # 3) repo B push to repo A. X is not pushed but the data that
         #    X as now public should
         #
         # The server can't handle it on it's own as it has no idea of
         # client phase data.
         keys['publishing'] = 'True'
     return keys
 
 def pushphase(repo, nhex, oldphasestr, newphasestr):
     """List phases root for serialization over pushkey"""
     repo = repo.unfiltered()
     with repo.lock():
         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:
             with repo.transaction('pushkey-phase') as tr:
                 advanceboundary(repo, tr, newphase, [bin(nhex)])
             return True
         elif currentphase == newphase:
             # raced, but got correct result
             return True
         else:
             return False
 
 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[:secret]:
         revset = "heads(%%ln & %s())" % phasenames[phase]
         headsbyphase[phase] = [cl.node(r) for r in repo.revs(revset, subset)]
     return 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]:
         revset = '%ln - _phase(%s)'
         heads = [c.node() for c in repo.set(revset, headsbyphase[phase], 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
 
     * subset is heads of the subset
     * roots is {<nodeid> => phase} mapping. key and value are string.
 
     Accept unknown element input
     """
     repo = repo.unfiltered()
     # build list from dictionary
     draftroots = []
     nodemap = repo.changelog.nodemap # to filter unknown nodes
     for nhex, phase in roots.iteritems():
         if nhex == 'publishing': # ignore data related to publish option
             continue
         node = bin(nhex)
         phase = int(phase)
         if phase == public:
             if node != nullid:
                 repo.ui.warn(_('ignoring inconsistent public root'
                                ' from remote: %s\n') % nhex)
         elif phase == draft:
             if node in nodemap:
                 draftroots.append(node)
         else:
             repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n')
                          % (phase, nhex))
     # compute heads
     publicheads = newheads(repo, subset, draftroots)
     return publicheads, draftroots
 
 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]
 
 def newheads(repo, heads, roots):
     """compute new head of a subset minus another
 
     * `heads`: define the first subset
     * `roots`: define the second we subtract from the first"""
     # prevent an import cycle
     # phases > dagop > patch > copies > scmutil > obsolete > obsutil > phases
     from . import dagop
 
     repo = repo.unfiltered()
     cl = repo.changelog
     rev = cl.nodemap.get
     if not roots:
         return heads
     if not heads or heads == [nullid]:
         return []
     # The logic operated on revisions, convert arguments early for convenience
     new_heads = set(rev(n) for n in heads if n != nullid)
     roots = [rev(n) for n in roots]
     # compute the area we need to remove
     affected_zone = repo.revs("(%ld::%ld)", roots, new_heads)
     # heads in the area are no longer heads
     new_heads.difference_update(affected_zone)
     # revisions in the area have children outside of it,
     # They might be new heads
     candidates = repo.revs("parents(%ld + (%ld and merge())) and not null",
                            roots, affected_zone)
     candidates -= affected_zone
     if new_heads or candidates:
         # remove candidate that are ancestors of other heads
         new_heads.update(candidates)
         prunestart = repo.revs("parents(%ld) and not null", new_heads)
         pruned = dagop.reachableroots(repo, candidates, prunestart)
         new_heads.difference_update(pruned)
 
     return pycompat.maplist(cl.node, sorted(new_heads))
 
 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')
     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)
 
 def hassecret(repo):
     """utility function that check if a repo have any secret changeset."""
     return bool(repo._phasecache.phaseroots[2])
 
 def preparehookargs(node, old, new):
     if old is None:
         old = ''
     else:
         old = phasenames[old]
     return {'node': node,
             'oldphase': old,
             'phase': phasenames[new]}

tests/test-phases.t

@@ -1,906 +1,953 b''
   $ cat > $TESTTMP/hook.sh << 'EOF'
   > echo "test-hook-close-phase: $HG_NODE:  $HG_OLDPHASE -> $HG_PHASE"
   > EOF
 
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > phasereport=$TESTDIR/testlib/ext-phase-report.py
   > [hooks]
   > txnclose-phase.test = sh $TESTTMP/hook.sh
   > EOF
 
   $ hglog() { hg log --template "{rev} {phaseidx} {desc}\n" $*; }
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
   >    message="$1"
   >    shift
   >    hg ci -m "$message" $*
   > }
 
   $ hg init initialrepo
   $ cd initialrepo
 
 Cannot change null revision phase
 
   $ hg phase --force --secret null
   abort: cannot change null revision phase
   [255]
   $ hg phase null
   -1: public
 
   $ mkcommit A
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
 
 New commit are draft by default
 
   $ hglog
   0 1 A
 
 Following commit are draft too
 
   $ mkcommit B
   test-debug-phase: new rev 1:  x -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> draft
 
   $ hglog
   1 1 B
   0 1 A
 
 Draft commit are properly created over public one:
 
   $ hg phase --public .
   test-debug-phase: move rev 0: 1 -> 0
   test-debug-phase: move rev 1: 1 -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:  draft -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> public
   $ hg phase
   1: public
   $ hglog
   1 0 B
   0 0 A
 
   $ mkcommit C
   test-debug-phase: new rev 2:  x -> 1
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> draft
   $ mkcommit D
   test-debug-phase: new rev 3:  x -> 1
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> draft
 
   $ hglog
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test creating changeset as secret
 
   $ mkcommit E --config phases.new-commit='secret'
   test-debug-phase: new rev 4:  x -> 2
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:   -> secret
   $ hglog
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test the secret property is inherited
 
   $ mkcommit H
   test-debug-phase: new rev 5:  x -> 2
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:   -> secret
   $ hglog
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Even on merge
 
   $ hg up -q 1
   $ mkcommit "B'"
   test-debug-phase: new rev 6:  x -> 1
   created new head
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> draft
   $ hglog
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ hg merge 4 # E
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg phase
   6: draft
   4: secret
   $ hg ci -m "merge B' and E"
   test-debug-phase: new rev 7:  x -> 2
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:   -> secret
 
   $ hglog
   7 2 merge B' and E
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 Test secret changeset are not pushed
 
   $ hg init ../push-dest
   $ cat > ../push-dest/.hg/hgrc << EOF
   > [phases]
   > publish=False
   > EOF
   $ hg outgoing ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
   $ hg outgoing -r 'branch(default)' ../push-dest --template='{rev} {phase} {desc|firstline}\n'
   comparing with ../push-dest
   searching for changes
   0 public A
   1 public B
   2 draft C
   3 draft D
   6 draft B'
 
   $ hg push ../push-dest -f # force because we push multiple heads
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 1
   test-debug-phase: new rev 3:  x -> 1
   test-debug-phase: new rev 4:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> draft
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> draft
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> draft
   $ hglog
   7 2 merge B' and E
   6 1 B'
   5 2 H
   4 2 E
   3 1 D
   2 1 C
   1 0 B
   0 0 A
   $ cd ../push-dest
   $ hglog
   4 1 B'
   3 1 D
   2 1 C
   1 0 B
   0 0 A
 
 (Issue3303)
 Check that remote secret changeset are ignore when checking creation of remote heads
 
 We add a secret head into the push destination. This secret head shadows a
 visible shared between the initial repo and the push destination.
 
   $ hg up -q 4 # B'
   $ mkcommit Z --config phases.new-commit=secret
   test-debug-phase: new rev 5:  x -> 2
   test-hook-close-phase: 2713879da13d6eea1ff22b442a5a87cb31a7ce6a:   -> secret
   $ hg phase .
   5: secret
 
 We now try to push a new public changeset that descend from the common public
 head shadowed by the remote secret head.
 
   $ cd ../initialrepo
   $ hg up -q 6 #B'
   $ mkcommit I
   test-debug-phase: new rev 8:  x -> 1
   created new head
   test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061:   -> draft
   $ hg push ../push-dest
   pushing to ../push-dest
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   test-debug-phase: new rev 6:  x -> 1
   test-hook-close-phase: 6d6770faffce199f1fddd1cf87f6f026138cf061:   -> draft
 
 :note: The "(+1 heads)" is wrong as we do not had any visible head
 
 check that branch cache with "served" filter are properly computed and stored
 
   $ ls ../push-dest/.hg/cache/branch2*
   ../push-dest/.hg/cache/branch2-base
   ../push-dest/.hg/cache/branch2-served
   $ cat ../push-dest/.hg/cache/branch2-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
   $ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n'  #update visible cache too
   6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft
   5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret
   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft
   $ ls ../push-dest/.hg/cache/branch2*
   ../push-dest/.hg/cache/branch2-base
   ../push-dest/.hg/cache/branch2-served
   ../push-dest/.hg/cache/branch2-visible
   $ cat ../push-dest/.hg/cache/branch2-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
   $ cat ../push-dest/.hg/cache/branch2-visible
   6d6770faffce199f1fddd1cf87f6f026138cf061 6
   b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
   2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default
   6d6770faffce199f1fddd1cf87f6f026138cf061 o default
 
 
 Restore condition prior extra insertion.
   $ hg -q --config extensions.mq= strip .
   $ hg up -q 7
   $ cd ..
 
 Test secret changeset are not pull
 
   $ hg init pull-dest
   $ cd pull-dest
   $ hg pull ../initialrepo
   pulling from ../initialrepo
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
   new changesets 4a2df7238c3b:cf9fe039dfd6
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hglog
   4 0 B'
   3 0 D
   2 0 C
   1 0 B
   0 0 A
   $ cd ..
 
 But secret can still be bundled explicitly
 
   $ cd initialrepo
   $ hg bundle --base '4^' -r 'children(4)' ../secret-bundle.hg
   4 changesets found
   $ cd ..
 
 Test secret changeset are not cloned
 (during local clone)
 
   $ hg clone -qU initialrepo clone-dest
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   $ hglog -R clone-dest
   4 0 B'
   3 0 D
   2 0 C
   1 0 B
   0 0 A
 
 Test summary
 
   $ hg summary -R clone-dest --verbose
   parent: -1:000000000000  (no revision checked out)
   branch: default
   commit: (clean)
   update: 5 new changesets (update)
   $ hg summary -R initialrepo
   parent: 7:17a481b3bccb tip
    merge B' and E
   branch: default
   commit: (clean) (secret)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 3 draft, 3 secret
   $ hg summary -R initialrepo --quiet
   parent: 7:17a481b3bccb tip
   update: 1 new changesets, 2 branch heads (merge)
 
 Test revset
 
   $ cd initialrepo
   $ hglog -r 'public()'
   0 0 A
   1 0 B
   $ hglog -r 'draft()'
   2 1 C
   3 1 D
   6 1 B'
   $ hglog -r 'secret()'
   4 2 E
   5 2 H
   7 2 merge B' and E
 
 test that phase are displayed in log at debug level
 
   $ hg log --debug
   changeset:   7:17a481b3bccb796c0521ae97903d81c52bfee4af
   tag:         tip
   phase:       secret
   parent:      6:cf9fe039dfd67e829edf6522a45de057b5c86519
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   manifest:    7:5e724ffacba267b2ab726c91fc8b650710deaaa8
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C D E
   extra:       branch=default
   description:
   merge B' and E
   
   
   changeset:   6:cf9fe039dfd67e829edf6522a45de057b5c86519
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B'
   extra:       branch=default
   description:
   B'
   
   
   changeset:   5:a030c6be5127abc010fcbff1851536552e6951a8
   phase:       secret
   parent:      4:a603bfb5a83e312131cebcd05353c217d4d21dde
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      H
   extra:       branch=default
   description:
   H
   
   
   changeset:   4:a603bfb5a83e312131cebcd05353c217d4d21dde
   phase:       secret
   parent:      3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    4:7173fd1c27119750b959e3a0f47ed78abe75d6dc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      E
   extra:       branch=default
   description:
   E
   
   
   changeset:   3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
   phase:       draft
   parent:      2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      D
   extra:       branch=default
   description:
   D
   
   
   changeset:   2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757
   phase:       draft
   parent:      1:27547f69f25460a52fff66ad004e58da7ad3fb56
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    2:66a5a01817fdf5239c273802b5b7618d051c89e4
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      C
   extra:       branch=default
   description:
   C
   
   
   changeset:   1:27547f69f25460a52fff66ad004e58da7ad3fb56
   phase:       public
   parent:      0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      B
   extra:       branch=default
   description:
   B
   
   
   changeset:   0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256
   phase:       public
   parent:      -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      A
   extra:       branch=default
   description:
   A
   
   
 
 
 (Issue3707)
 test invalid phase name
 
   $ mkcommit I --config phases.new-commit='babar'
   transaction abort!
   rollback completed
   abort: phases.new-commit: not a valid phase name ('babar')
   [255]
 Test phase command
 ===================
 
 initial picture
 
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 display changesets phase
 
 (mixing -r and plain rev specification)
 
   $ hg phase 1::4 -r 7
   1: public
   2: draft
   3: draft
   4: secret
   7: secret
 
 
 move changeset forward
 
 (with -r option)
 
   $ hg phase --public -r 2
   test-debug-phase: move rev 2: 1 -> 0
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  draft -> public
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset backward
 
 (without -r option)
 
   $ hg phase --draft --force 2
   test-debug-phase: move rev 2: 0 -> 1
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  public -> draft
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 move changeset forward and backward
 
   $ hg phase --draft --force 1::4
   test-debug-phase: move rev 1: 0 -> 1
   test-debug-phase: move rev 4: 2 -> 1
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  public -> draft
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  secret -> draft
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 secret merge B' and E
   |\
   | o  6 draft B'
   | |
   +---o  5 secret H
   | |
   o |  4 draft E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
   o  1 draft B
   |
   o  0 public A
   
 test partial failure
 
   $ hg phase --public 7
   test-debug-phase: move rev 1: 1 -> 0
   test-debug-phase: move rev 2: 1 -> 0
   test-debug-phase: move rev 3: 1 -> 0
   test-debug-phase: move rev 4: 1 -> 0
   test-debug-phase: move rev 6: 1 -> 0
   test-debug-phase: move rev 7: 2 -> 0
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:  draft -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:  draft -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  draft -> public
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  draft -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:  draft -> public
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  secret -> public
   $ hg phase --draft '5 or 7'
   test-debug-phase: move rev 5: 2 -> 1
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:  secret -> draft
   cannot move 1 changesets to a higher phase, use --force
   phase changed for 1 changesets
   [1]
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    7 public merge B' and E
   |\
   | o  6 public B'
   | |
   +---o  5 draft H
   | |
   o |  4 public E
   | |
   o |  3 public D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 test complete failure
 
   $ hg phase --draft 7
   cannot move 1 changesets to a higher phase, use --force
   no phases changed
   [1]
 
   $ cd ..
 
 test hidden changeset are not cloned as public (issue3935)
 
   $ cd initialrepo
 
 (enabling evolution)
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
 (making a changeset hidden; H in that case)
   $ hg debugobsolete `hg id --debug -r 5`
   obsoleted 1 changesets
 
   $ cd ..
   $ hg clone initialrepo clonewithobs
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 7 changesets with 6 changes to 6 files
   new changesets 4a2df7238c3b:17a481b3bccb
   test-debug-phase: new rev 0:  x -> 0
   test-debug-phase: new rev 1:  x -> 0
   test-debug-phase: new rev 2:  x -> 0
   test-debug-phase: new rev 3:  x -> 0
   test-debug-phase: new rev 4:  x -> 0
   test-debug-phase: new rev 5:  x -> 0
   test-debug-phase: new rev 6:  x -> 0
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> public
   test-hook-close-phase: 27547f69f25460a52fff66ad004e58da7ad3fb56:   -> public
   test-hook-close-phase: f838bfaca5c7226600ebcfd84f3c3c13a28d3757:   -> public
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:   -> public
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:   -> public
   test-hook-close-phase: cf9fe039dfd67e829edf6522a45de057b5c86519:   -> public
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:   -> public
   updating to branch default
   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd clonewithobs
   $ hg log -G --template "{rev} {phase} {desc}\n"
   @    6 public merge B' and E
   |\
   | o  5 public B'
   | |
   o |  4 public E
   | |
   o |  3 public D
   | |
   o |  2 public C
   |/
   o  1 public B
   |
   o  0 public A
   
 
 test verify repo containing hidden changesets, which should not abort just
 because repo.cancopy() is False
 
   $ cd ../initialrepo
   $ hg verify
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 8 changesets with 7 changes to 7 files
 
   $ cd ..
 
 check whether HG_PENDING makes pending changes only in related
 repositories visible to an external hook.
 
 (emulate a transaction running concurrently by copied
 .hg/phaseroots.pending in subsequent test)
 
   $ cat > $TESTTMP/savepending.sh <<EOF
   > cp .hg/store/phaseroots.pending  .hg/store/phaseroots.pending.saved
   > exit 1 # to avoid changing phase for subsequent tests
   > EOF
   $ cd push-dest
   $ hg phase 6
   6: draft
   $ hg --config hooks.pretxnclose="sh $TESTTMP/savepending.sh" phase -f -s 6
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [255]
   $ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending
 
 (check (in)visibility of phaseroot while transaction running in repo)
 
   $ cat > $TESTTMP/checkpending.sh <<EOF
   > echo '@initialrepo'
   > hg -R "$TESTTMP/initialrepo" phase 7
   > echo '@push-dest'
   > hg -R "$TESTTMP/push-dest" phase 6
   > exit 1 # to avoid changing phase for subsequent tests
   > EOF
   $ cd ../initialrepo
   $ hg phase 7
   7: public
   $ hg --config hooks.pretxnclose="sh $TESTTMP/checkpending.sh" phase -f -s 7
   @initialrepo
   7: secret
   @push-dest
   6: draft
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [255]
 
 Check that pretxnclose-phase hook can control phase movement
 
   $ hg phase --force b3325c91a4d9 --secret
   test-debug-phase: move rev 3: 0 -> 2
   test-debug-phase: move rev 4: 0 -> 2
   test-debug-phase: move rev 5: 1 -> 2
   test-debug-phase: move rev 7: 0 -> 2
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  public -> secret
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  public -> secret
   test-hook-close-phase: a030c6be5127abc010fcbff1851536552e6951a8:  draft -> secret
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  public -> secret
   $ hg log -G -T phases
   @    changeset:   7:17a481b3bccb
   |\   tag:         tip
   | |  phase:       secret
   | |  parent:      6:cf9fe039dfd6
   | |  parent:      4:a603bfb5a83e
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     merge B' and E
   | |
   | o  changeset:   6:cf9fe039dfd6
   | |  phase:       public
   | |  parent:      1:27547f69f254
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     B'
   | |
   o |  changeset:   4:a603bfb5a83e
   | |  phase:       secret
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     E
   | |
   o |  changeset:   3:b3325c91a4d9
   | |  phase:       secret
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     D
   | |
   o |  changeset:   2:f838bfaca5c7
   |/   phase:       public
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     C
   |
   o  changeset:   1:27547f69f254
   |  phase:       public
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     B
   |
   o  changeset:   0:4a2df7238c3b
      phase:       public
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Install a hook that prevent b3325c91a4d9 to become public
 
   $ cat >> .hg/hgrc << EOF
   > [hooks]
   > pretxnclose-phase.nopublish_D = sh -c "(echo \$HG_NODE| grep -v b3325c91a4d9>/dev/null) || [ 'public' != \$HG_PHASE ]"
   > EOF
 
 Try various actions. only the draft move should succeed
 
   $ hg phase --public b3325c91a4d9
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [255]
   $ hg phase --public a603bfb5a83e
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [255]
   $ hg phase --draft 17a481b3bccb
   test-debug-phase: move rev 3: 2 -> 1
   test-debug-phase: move rev 4: 2 -> 1
   test-debug-phase: move rev 7: 2 -> 1
   test-hook-close-phase: b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e:  secret -> draft
   test-hook-close-phase: a603bfb5a83e312131cebcd05353c217d4d21dde:  secret -> draft
   test-hook-close-phase: 17a481b3bccb796c0521ae97903d81c52bfee4af:  secret -> draft
   $ hg phase --public 17a481b3bccb
   transaction abort!
   rollback completed
   abort: pretxnclose-phase.nopublish_D hook exited with status 1
   [255]
 
   $ cd ..
 
 Test for the "internal" phase
 =============================
 
 Check we deny its usage on older repository
 
   $ hg init no-internal-phase --config format.internal-phase=no
   $ cd no-internal-phase
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   revlogv1
   store
   $ echo X > X
   $ hg add X
   $ hg status
   A X
   $ hg --config "phases.new-commit=internal" commit -m "my test internal commit" 2>&1 | grep ProgrammingError
   ** ProgrammingError: this repository does not support the internal phase
       raise error.ProgrammingError(msg)
   mercurial.error.ProgrammingError: this repository does not support the internal phase
+  $ hg --config "phases.new-commit=archived" commit -m "my test archived commit" 2>&1 | grep ProgrammingError
+  ** ProgrammingError: this repository does not support the archived phase
+      raise error.ProgrammingError(msg)
+  mercurial.error.ProgrammingError: this repository does not support the archived phase
 
   $ cd ..
 
 Check it works fine with repository that supports it.
 
   $ hg init internal-phase --config format.internal-phase=yes
   $ cd internal-phase
   $ cat .hg/requires
   dotencode
   fncache
   generaldelta
   internal-phase
   revlogv1
   store
   $ mkcommit A
   test-debug-phase: new rev 0:  x -> 1
   test-hook-close-phase: 4a2df7238c3b48766b5e22fafbb8a2f506ec8256:   -> draft
 
 Commit an internal changesets
 
   $ echo B > B
   $ hg add B
   $ hg status
   A B
   $ hg --config "phases.new-commit=internal" commit -m "my test internal commit"
   test-debug-phase: new rev 1:  x -> 96
   test-hook-close-phase: c01c42dffc7f81223397e99652a0703f83e1c5ea:   -> internal
 
-Usual visibility rules apply when working directory parents
+The changeset is a working parent descendant.
+Per the usual visibility rules, it is made visible.
 
   $ hg log -G -l 3
   @  changeset:   1:c01c42dffc7f
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     my test internal commit
   |
   o  changeset:   0:4a2df7238c3b
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
 
 Commit is hidden as expected
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   @  changeset:   0:4a2df7238c3b
      tag:         tip
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A
   
+
+Test for archived phase
+-----------------------
+
+Commit an archived changesets
+
+  $ echo B > B
+  $ hg add B
+  $ hg status
+  A B
+  $ hg --config "phases.new-commit=archived" commit -m "my test archived commit"
+  test-debug-phase: new rev 2:  x -> 32
+  test-hook-close-phase: 8df5997c3361518f733d1ae67cd3adb9b0eaf125:   -> archived
+
+The changeset is a working parent descendant.
+Per the usual visibility rules, it is made visible.
+
+  $ hg log -G -l 3
+  @  changeset:   2:8df5997c3361
+  |  tag:         tip
+  |  parent:      0:4a2df7238c3b
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     my test archived commit
+  |
+  o  changeset:   0:4a2df7238c3b
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     A
+  
+
+Commit is hidden as expected
+
+  $ hg up 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ hg log -G
+  @  changeset:   0:4a2df7238c3b
+     tag:         tip
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     A
+