diff hgext3rd/topic/__init__.py @ 4232:424b498aac00

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 10 Nov 2018 00:55:34 +0100
parents a4d5dcc836ab 3eb78bdcdd7c
children 259d57b906a4
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Fri Oct 26 12:54:40 2018 +0530
+++ b/hgext3rd/topic/__init__.py	Sat Nov 10 00:55:34 2018 +0100
@@ -652,9 +652,8 @@
                         " '_' and '.' characters")
             raise error.Abort(_("invalid topic name: '%s'") % topic, hint=helptxt)
 
-    ui.pager('topics')
-
     if list:
+        ui.pager('topics')
         if clear or rev:
             raise error.Abort(_("cannot use --clear or --rev with --list"))
         if not topic:
@@ -700,6 +699,7 @@
             ui.status(_('marked working directory as topic: %s\n') % topic)
         return _changecurrenttopic(repo, topic)
 
+    ui.pager('topics')
     # `hg topic --current`
     ret = 0
     if current and not ct: