Mercurial > hg > evolve

changeset 3032:3a9303b7b648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topics: show working directory branch when topic is empty
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Sep 2017 22:48:55 +0530
parents 6f7f8c6fcfb0
children b54abc7e80e2
files hgext3rd/topic/stack.py tests/test-topic-stack.t tests/test-topic.t
diffstat 3 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/stack.py
+++ b/hgext3rd/topic/stack.py
@@ -169,7 +169,10 @@
 
     @util.propertycache
     def branches(self):
-        return sorted(set(self._repo[r].branch() for r in self._revs))
+        branches = sorted(set(self._repo[r].branch() for r in self._revs))
+        if not branches:
+            branches = set([self._repo[None].branch()])
+        return branches
 
 def labelsgen(prefix, labelssuffix):
     """ Takes a label prefix and a list of suffixes. Returns a string of the prefix
--- a/tests/test-topic-stack.t
+++ b/tests/test-topic-stack.t
@@ -66,7 +66,7 @@
    * other
   $ hg stack
   ### topic: other
-  ### branch: 
+  ### branch: default
 
   $ hg up foo
   switching to topic foo
@@ -224,7 +224,7 @@
 
   $ hg topic --clear
   $ hg stack
-  ### branch: 
+  ### branch: default
 
 Test "t#" reference
 -------------------
--- a/tests/test-topic.t
+++ b/tests/test-topic.t
@@ -139,10 +139,10 @@
   $ hg topics
    * narf
   $ hg topics -v
-   * narf (on branch: , 0 changesets)
+   * narf (on branch: default, 0 changesets)
   $ hg stack
   ### topic: narf
-  ### branch: 
+  ### branch: default
 
 Add commits to topic