Patchwork D2397: show: use the new stack definition for show stack

login
register
mail settings
Submitter phabricator
Date Feb. 23, 2018, 10:36 a.m.
Message ID <differential-rev-PHID-DREV-lhdkfsxyhw3rbfvbeeny-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28268/
State Superseded
Headers show

Comments

phabricator - Feb. 23, 2018, 10:36 a.m.
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Now that we have a common stack definition, use it in the hg show stack
  command.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2397

AFFECTED FILES
  mercurial/destutil.py

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel
phabricator - March 21, 2018, 2:17 p.m.
yuja added inline comments.

INLINE COMMENTS

> destutil.py:16
>      scmutil,
> +    stack
>  )

Style nit: missing comma

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2397

To: lothiraldan, #hg-reviewers, indygreg
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/destutil.py b/mercurial/destutil.py
--- a/mercurial/destutil.py
+++ b/mercurial/destutil.py
@@ -13,6 +13,7 @@ 
     error,
     obsutil,
     scmutil,
+    stack
 )
 
 def _destupdateobs(repo, clean):
@@ -355,9 +356,7 @@ 
     return None
 
 def stackbase(ui, repo):
-    # The histedit default base stops at public changesets, branchpoints,
-    # and merges, which is exactly what we want for a stack.
-    revs = scmutil.revrange(repo, [histeditdefaultrevset])
+    revs = stack.getstack(repo)
     return revs.last() if revs else None
 
 def _statusotherbook(ui, repo):