Mercurial > evolve
changeset 2691:9b68a2083dac
topic: drop the message about running evolve after topic change
Topic change is no longer creating a mess that needs cleaning.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 02 Jul 2017 13:49:32 +0200 |
| parents | 5d839e1f0ce9 |
| children | 96843c68acc8 |
| files | hgext3rd/topic/__init__.py tests/test-stack-branch.t tests/test-topic.t |
| diffstat | 3 files changed, 0 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Sun Jul 02 13:48:45 2017 +0200 +++ b/hgext3rd/topic/__init__.py Sun Jul 02 13:49:32 2017 +0200 @@ -340,7 +340,6 @@ def _changetopics(ui, repo, revset, newtopic): rewrote = 0 - needevolve = False wl = l = txn = None try: wl = repo.wlock() @@ -392,7 +391,6 @@ newnode = repo.commitctx(mc) 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 @@ -407,9 +405,6 @@ 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) def _listtopics(ui, repo, opts): fm = ui.formatter('topics', opts)
--- a/tests/test-stack-branch.t Sun Jul 02 13:48:45 2017 +0200 +++ b/tests/test-stack-branch.t Sun Jul 02 13:49:32 2017 +0200 @@ -280,7 +280,6 @@ $ hg topic --rev b4::b5 sometopic changed topic on 2 changes - please run hg evolve --rev "topic(sometopic)" now $ hg stack ### branch: foo b3: c_h
--- a/tests/test-topic.t Sun Jul 02 13:48:45 2017 +0200 +++ b/tests/test-topic.t Sun Jul 02 13:49:32 2017 +0200 @@ -554,7 +554,6 @@ Can clear topics $ hg topic --rev 9 --clear changed topic on 1 changes - please run hg evolve --rev "not topic()" now $ hg log -Gr 'draft() and not obsolete()' o changeset: 11:0beca5ab56c3 | tag: tip @@ -587,7 +586,6 @@ phases: 2 draft $ hg topic --rev 11 wat changed topic on 1 changes - please run hg evolve --rev "topic(wat)" now $ hg log -r . changeset: 12:18b70b8de1f0 user: test @@ -708,7 +706,6 @@ $ hg topics --rev '13::19' changewat switching to topic changewat changed topic on 2 changes - please run hg evolve --rev "topic(changewat)" now $ hg log -Gr 'draft()' @ changeset: 21:56c83be6105f | tag: tip @@ -758,7 +755,6 @@ $ hg topics --rev 't1::' changewut switching to topic changewut changed topic on 3 changes - please run hg evolve --rev "topic(changewut)" now $ hg log -Gr 'draft()' @ changeset: 25:729ed5717393 | tag: tip