# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1498683069 -19800 # Node ID a6e3c2fcb1d7db5eee786a0e52fc6db0956897f8 # Parent aa4db71a6224fdb6d09668e9b76dccc5800cce88 topic: don't abort if there is no current topic in stack() revset Named branches support has been added and we should not abort if there is no active topic. diff --git a/hgext3rd/topic/revset.py b/hgext3rd/topic/revset.py --- a/hgext3rd/topic/revset.py +++ b/hgext3rd/topic/revset.py @@ -1,8 +1,6 @@ from __future__ import absolute_import -from mercurial.i18n import _ from mercurial import ( - error, phases, revset, util, @@ -74,9 +72,6 @@ err = 'stack() takes no argument, it works on current topic' revset.getargs(x, 0, 0, err) topic = repo.currenttopic - if not topic: - raise error.Abort(_('no active topic to list')) - # ordering hack, boo topic = None branch = None if not topic and repo.currenttopic: diff --git a/tests/test-stack-branch.t b/tests/test-stack-branch.t --- a/tests/test-stack-branch.t +++ b/tests/test-stack-branch.t @@ -139,8 +139,10 @@ Also test the revset: $ hg log -r 'stack()' - abort: no active topic to list - [255] + 2 foo {} draft c_c + 7 foo {} draft c_d + 4 foo {} draft c_e + 5 foo {} draft c_f Case with multiple heads on the topic -------------------------------------