comparison hgext/states.py @ 55:cf4626a13345

Update pushkey code to be able to push ready heads too.

54:ad1a4fb0fc49

ST2 = state('draft', _NOSHARE | _MUTABLE)
ST1 = state('ready', _MUTABLE, next=ST2)
ST0 = state('published', next=ST1)

STATES = (ST0, ST1, ST2)

@util.cachefunc
def laststatewithout(prop):
    for state in STATES:
        if not state.properties & prop:

        cmdtable[state.name] = (cmdmoveheads, [], '<revset>')

# Pushkey mechanism for mutable
#########################################

def pushimmutableheads(repo, key, old, new):
    st = ST0
    w = repo.wlock()
    try:
        newhead = node.bin(key)
        repo[newhead]
        repo.setstate(ST0, [newhead])
    finally:
        w.release()

def listimmutableheads(repo):
    return dict.fromkeys(map(node.hex, repo.stateheads(ST0)), '1')

pushkey.register('immutableheads', pushimmutableheads, listimmutableheads)

        def setstate(self, state, nodes):
            """change state of targets changeset and it's ancestors.

            Simplify the list of head."""
            assert not isinstance(nodes, basestring)
            heads = self._statesheads[state]
            olds = heads[:]
            heads.extend(nodes)
            heads[:] = set(heads)
            heads.sort()

        ### pull // push support

        def pull(self, remote, *args, **kwargs):
            result = opull(remote, *args, **kwargs)
            remoteheads = self._pullimmutableheads(remote)
            #print [node.short(h) for h in remoteheads]
            self.setstate(ST0, remoteheads)
            return result

        def push(self, remote, *args, **opts):
            result = opush(remote, *args, **opts)
            remoteheads = self._pullimmutableheads(remote)
            self.setstate(ST0, remoteheads)
            if remoteheads != self.stateheads(ST0):
                #print 'stuff to push'
                #print 'remote', [node.short(h) for h in remoteheads]
                #print 'local',  [node.short(h) for h in self._statesheads[ST0]]
                self._pushimmutableheads(remote, remoteheads)
            return result

        def _pushimmutableheads(self, remote, remoteheads):
            missing = set(self.stateheads(ST0)) - set(remoteheads)
            while missing:
                h = missing.pop()
                try:
                    remote.pushkey('immutableheads', node.hex(h), '', '1')
                except error.RepoLookupError:
                    missing.update(p.node() for p in repo[h].parents())


        def _pullimmutableheads(self, remote):
            self.ui.debug('checking for immutableheadshg on server')
            if 'immutableheads' not in remote.listkeys('namespaces'):
                self.ui.debug('immutableheads not enabled on the remote server, '
                              'marking everything as frozen')
                remote = remote.heads()
            else:
                self.ui.debug('server has immutableheads enabled, merging lists')
                remote = map(node.bin, remote.listkeys('immutableheads'))
            return remote

        ### Tag support

        def _tag(self, names, node, *args, **kwargs):
            tagnode = o_tag(names, node, *args, **kwargs)

55:cf4626a13345

ST2 = state('draft', _NOSHARE | _MUTABLE)
ST1 = state('ready', _MUTABLE, next=ST2)
ST0 = state('published', next=ST1)

STATES = (ST0, ST1, ST2)
STATESMAP =dict([(st.name, st) for st in STATES])

@util.cachefunc
def laststatewithout(prop):
    for state in STATES:
        if not state.properties & prop:

        cmdtable[state.name] = (cmdmoveheads, [], '<revset>')

# Pushkey mechanism for mutable
#########################################

def pushstatesheads(repo, key, old, new):
    st = STATESMAP[new]
    w = repo.wlock()
    try:
        newhead = node.bin(key)
        repo[newhead]
        repo.setstate(st, [newhead])
    finally:
        w.release()

def liststatesheads(repo):
    keys = {}
    for state in [st for st in STATES if st.trackheads]:
        for head in repo.stateheads(state):
            head = node.hex(head)
            if head in keys:
                keys[head] += ',' + state.name
            else:
                keys[head] = state.name
    return keys

pushkey.register('states-heads', pushstatesheads, liststatesheads)

        def setstate(self, state, nodes):
            """change state of targets changeset and it's ancestors.

            Simplify the list of head."""
            assert not isinstance(nodes, basestring), repr(nodes)
            heads = self._statesheads[state]
            olds = heads[:]
            heads.extend(nodes)
            heads[:] = set(heads)
            heads.sort()

        ### pull // push support

        def pull(self, remote, *args, **kwargs):
            result = opull(remote, *args, **kwargs)
            remoteheads = self._pullstatesheads(remote)
            #print [node.short(h) for h in remoteheads]
            for st, heads in remoteheads.iteritems():
                self.setstate(st, heads)
            return result

        def push(self, remote, *args, **opts):
            result = opush(remote, *args, **opts)
            remoteheads = self._pullstatesheads(remote)
            for st, heads in remoteheads.iteritems():
                self.setstate(st, heads)
                if heads != self.stateheads(st):
                    self._pushstatesheads(remote, st,  heads)
            return result

        def _pushstatesheads(self, remote, state, remoteheads):
            local = set(self.stateheads(state))
            missing = local - set(remoteheads)
            while missing:
                h = missing.pop()
                try:
                    remote.pushkey('states-heads', node.hex(h), '', state.name)
                except error.RepoLookupError:
                    missing.update(p.node() for p in repo[h].parents())


        def _pullstatesheads(self, remote):
            remoteheads = {}
            self.ui.debug('checking for states-heads on remote server')
            if 'states-heads' not in remote.listkeys('namespaces'):
                self.ui.debug('states-heads not enabled on the remote server, '
                              'marking everything as published')
                remoteheads[ST0] = remote.heads()
            else:
                self.ui.debug('server has states-heads enabled, merging lists')
                for hex, statenames in  remote.listkeys('states-heads').iteritems():
                    for stn in statenames.split(','):
                        remoteheads.setdefault(STATESMAP[stn], []).append(node.bin(hex))
            return remoteheads

        ### Tag support

        def _tag(self, names, node, *args, **kwargs):
            tagnode = o_tag(names, node, *args, **kwargs)