comparison hgext3rd/topic/__init__.py @ 2648:d8b47d961c77

topic-change: update the working copy along when changing topic of '.'

This avoids leaving the working copy behind, removing another large parts of
issue5441.

2647:b9cfb8bd0965

    cmdutil,
    commands,
    context,
    error,
    extensions,
    localrepo,
    lock,
    merge,
    namespaces,
    node,

    return stack.showstack(ui, repo, topic, opts)

def _changetopics(ui, repo, revset, newtopic):
    rewrote = 0
    needevolve = False
    l = txn = None
    try:
        l = repo.lock()
        txn = repo.transaction('rewrite-topics')
        p1 = None
        p2 = None
        successors = {}

            successors[c.node()] = newnode
            ui.debug('new node id is %s\n' % node.hex(newnode))
            needevolve = needevolve or (len(c.children()) > 0)
            obsolete.createmarkers(repo, [(c, (repo[newnode],))])
            rewrote += 1
        txn.close()
    finally:
        lock.release(txn, l)
        repo.invalidate()
    ui.status('changed topic on %d changes\n' % rewrote)
    if needevolve:
        evolvetarget = 'topic(%s)' % newtopic if newtopic else 'not topic()'
        ui.status('please run hg evolve --rev "%s" now\n' % evolvetarget)

2648:d8b47d961c77

    cmdutil,
    commands,
    context,
    error,
    extensions,
    hg,
    localrepo,
    lock,
    merge,
    namespaces,
    node,

    return stack.showstack(ui, repo, topic, opts)

def _changetopics(ui, repo, revset, newtopic):
    rewrote = 0
    needevolve = False
    wl = l = txn = None
    try:
        wl = repo.wlock()
        l = repo.lock()
        txn = repo.transaction('rewrite-topics')
        p1 = None
        p2 = None
        successors = {}

            successors[c.node()] = newnode
            ui.debug('new node id is %s\n' % node.hex(newnode))
            needevolve = needevolve or (len(c.children()) > 0)
            obsolete.createmarkers(repo, [(c, (repo[newnode],))])
            rewrote += 1
        # move the working copy too
        wctx = repo[None]
        # in-progress merge is a bit too complexe for now.
        if len(wctx.parents()) == 1:
            newid = successors.get(wctx.p1().node())
            if newid is not None:
                # this provide some useless output we shoudl eventually suppress
                #
                # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
                hg.update(repo, newid)
        txn.close()
    finally:
        lock.release(txn, l, wl)
        repo.invalidate()
    ui.status('changed topic on %d changes\n' % rewrote)
    if needevolve:
        evolvetarget = 'topic(%s)' % newtopic if newtopic else 'not topic()'
        ui.status('please run hg evolve --rev "%s" now\n' % evolvetarget)