| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/convert/hg.py (2 lines) | |||
| M | mercurial/changegroup.py (2 lines) | |||
| M | mercurial/commit.py (2 lines) | |||
| M | mercurial/exchangev2.py (4 lines) | |||
| M | mercurial/phases.py (17 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger |
| # If the node value has changed, but the phase is lower than | # If the node value has changed, but the phase is lower than | ||||
| # draft, set it back to draft since it hasn't been exposed | # draft, set it back to draft since it hasn't been exposed | ||||
| # anywhere. | # anywhere. | ||||
| if commit.rev != node: | if commit.rev != node: | ||||
| ctx = self.repo[node] | ctx = self.repo[node] | ||||
| if ctx.phase() < phases.draft: | if ctx.phase() < phases.draft: | ||||
| phases.registernew( | phases.registernew( | ||||
| self.repo, tr, phases.draft, [ctx.node()] | self.repo, tr, phases.draft, [ctx.rev()] | ||||
| ) | ) | ||||
| text = b"(octopus merge fixup)\n" | text = b"(octopus merge fixup)\n" | ||||
| p2 = node | p2 = node | ||||
| if self.filemapmode and nparents == 1: | if self.filemapmode and nparents == 1: | ||||
| man = self.repo.manifestlog.getstorage(b'') | man = self.repo.manifestlog.getstorage(b'') | ||||
| mnode = self.repo.changelog.read(nodemod.bin(p2))[0] | mnode = self.repo.changelog.read(nodemod.bin(p2))[0] | ||||
| # closer target phase computation | # closer target phase computation | ||||
| # Those changesets have been pushed from the | # Those changesets have been pushed from the | ||||
| # outside, their phases are going to be pushed | # outside, their phases are going to be pushed | ||||
| # alongside. Therefor `targetphase` is | # alongside. Therefor `targetphase` is | ||||
| # ignored. | # ignored. | ||||
| targetphase = phaseall = phases.draft | targetphase = phaseall = phases.draft | ||||
| if added: | if added: | ||||
| phases.registernew(repo, tr, targetphase, [], revs=added) | phases.registernew(repo, tr, targetphase, added) | ||||
| if phaseall is not None: | if phaseall is not None: | ||||
| phases.advanceboundary(repo, tr, phaseall, cgnodes, revs=added) | phases.advanceboundary(repo, tr, phaseall, cgnodes, revs=added) | ||||
| cgnodes = [] | cgnodes = [] | ||||
| if changesets > 0: | if changesets > 0: | ||||
| def runhooks(unused_success): | def runhooks(unused_success): | ||||
| # These hooks run when the lock releases, not when the | # These hooks run when the lock releases, not when the | ||||
| # set the new commit is proper phase | # set the new commit is proper phase | ||||
| targetphase = subrepoutil.newcommitphase(repo.ui, ctx) | targetphase = subrepoutil.newcommitphase(repo.ui, ctx) | ||||
| if targetphase: | if targetphase: | ||||
| # retract boundary do not alter parent changeset. | # retract boundary do not alter parent changeset. | ||||
| # if a parent have higher the resulting phase will | # if a parent have higher the resulting phase will | ||||
| # be compliant anyway | # be compliant anyway | ||||
| # | # | ||||
| # if minimal phase was 0 we don't need to retract anything | # if minimal phase was 0 we don't need to retract anything | ||||
| phases.registernew(repo, tr, targetphase, [n]) | phases.registernew(repo, tr, targetphase, [repo[n].rev()]) | ||||
| return n | return n | ||||
| def _prepare_files(tr, ctx, error=False, origctx=None): | def _prepare_files(tr, ctx, error=False, origctx=None): | ||||
| repo = ctx.repo() | repo = ctx.repo() | ||||
| p1 = ctx.p1() | p1 = ctx.p1() | ||||
| writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) | writechangesetcopy, writefilecopymeta = _write_copy_meta(repo) | ||||
| csetres = _fetchchangesets(repo, tr, remote, common, fetch, pullheads) | csetres = _fetchchangesets(repo, tr, remote, common, fetch, pullheads) | ||||
| # New revisions are written to the changelog. But all other updates | # New revisions are written to the changelog. But all other updates | ||||
| # are deferred. Do those now. | # are deferred. Do those now. | ||||
| # Ensure all new changesets are draft by default. If the repo is | # Ensure all new changesets are draft by default. If the repo is | ||||
| # publishing, the phase will be adjusted by the loop below. | # publishing, the phase will be adjusted by the loop below. | ||||
| if csetres[b'added']: | if csetres[b'added']: | ||||
| phases.registernew(repo, tr, phases.draft, csetres[b'added']) | phases.registernew( | ||||
| repo, tr, phases.draft, [repo[n].rev() for n in csetres[b'added']] | |||||
| ) | |||||
| # And adjust the phase of all changesets accordingly. | # And adjust the phase of all changesets accordingly. | ||||
| for phasenumber, phase in phases.phasenames.items(): | for phasenumber, phase in phases.phasenames.items(): | ||||
| if phase == b'secret' or not csetres[b'nodesbyphase'][phase]: | if phase == b'secret' or not csetres[b'nodesbyphase'][phase]: | ||||
| continue | continue | ||||
| phases.advanceboundary( | phases.advanceboundary( | ||||
| repo, tr, phasenumber, csetres[b'nodesbyphase'][phase], | repo, tr, phasenumber, csetres[b'nodesbyphase'][phase], | ||||
| def _updateroots(self, phase, newroots, tr): | def _updateroots(self, phase, newroots, tr): | ||||
| self.phaseroots[phase] = newroots | self.phaseroots[phase] = newroots | ||||
| self.invalidate() | self.invalidate() | ||||
| self.dirty = True | self.dirty = True | ||||
| tr.addfilegenerator(b'phase', (b'phaseroots',), self._write) | tr.addfilegenerator(b'phase', (b'phaseroots',), self._write) | ||||
| tr.hookargs[b'phases_moved'] = b'1' | tr.hookargs[b'phases_moved'] = b'1' | ||||
| def registernew(self, repo, tr, targetphase, nodes, revs=None): | def registernew(self, repo, tr, targetphase, revs): | ||||
| if revs is None: | |||||
| revs = [] | |||||
| repo = repo.unfiltered() | repo = repo.unfiltered() | ||||
| self._retractboundary(repo, tr, targetphase, nodes, revs=revs) | self._retractboundary(repo, tr, targetphase, [], revs=revs) | ||||
| if tr is not None and b'phases' in tr.changes: | if tr is not None and b'phases' in tr.changes: | ||||
| phasetracking = tr.changes[b'phases'] | phasetracking = tr.changes[b'phases'] | ||||
| torev = repo.changelog.rev | |||||
| phase = self.phase | phase = self.phase | ||||
| revs = [torev(node) for node in nodes] + sorted(revs) | for rev in sorted(revs): | ||||
| revs.sort() | |||||
| for rev in revs: | |||||
| revphase = phase(repo, rev) | revphase = phase(repo, rev) | ||||
| _trackphasechange(phasetracking, rev, None, revphase) | _trackphasechange(phasetracking, rev, None, revphase) | ||||
| repo.invalidatevolatilesets() | repo.invalidatevolatilesets() | ||||
| def advanceboundary( | def advanceboundary( | ||||
| self, repo, tr, targetphase, nodes, revs=None, dryrun=None | self, repo, tr, targetphase, nodes, revs=None, dryrun=None | ||||
| ): | ): | ||||
| """Set all 'nodes' to phase 'targetphase' | """Set all 'nodes' to phase 'targetphase' | ||||
| are set in the target phase or kept in a *higher* phase. | are set in the target phase or kept in a *higher* phase. | ||||
| Simplify boundary to contains phase roots only.""" | Simplify boundary to contains phase roots only.""" | ||||
| phcache = repo._phasecache.copy() | phcache = repo._phasecache.copy() | ||||
| phcache.retractboundary(repo, tr, targetphase, nodes) | phcache.retractboundary(repo, tr, targetphase, nodes) | ||||
| repo._phasecache.replace(phcache) | repo._phasecache.replace(phcache) | ||||
| def registernew(repo, tr, targetphase, nodes, revs=None): | def registernew(repo, tr, targetphase, revs): | ||||
| """register a new revision and its phase | """register a new revision and its phase | ||||
| Code adding revisions to the repository should use this function to | Code adding revisions to the repository should use this function to | ||||
| set new changeset in their target phase (or higher). | set new changeset in their target phase (or higher). | ||||
| """ | """ | ||||
| if revs is None: | |||||
| revs = [] | |||||
| phcache = repo._phasecache.copy() | phcache = repo._phasecache.copy() | ||||
| phcache.registernew(repo, tr, targetphase, nodes, revs=revs) | phcache.registernew(repo, tr, targetphase, revs) | ||||
| repo._phasecache.replace(phcache) | repo._phasecache.replace(phcache) | ||||
| def listphases(repo): | def listphases(repo): | ||||
| """List phases root for serialization over pushkey""" | """List phases root for serialization over pushkey""" | ||||
| # Use ordered dictionary so behavior is deterministic. | # Use ordered dictionary so behavior is deterministic. | ||||
| keys = util.sortdict() | keys = util.sortdict() | ||||
| value = b'%i' % draft | value = b'%i' % draft | ||||