( )⚙ D2397 show: use the new stack definition for show stack

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2397

show: use the new stack definition for show stack
ClosedPublic

Authored by lothiraldan on Feb 23 2018, 5:36 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa72198790e15: show: use the new stack definition for show stack
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Feb 23 2018, 5:36 AM
indygreg accepted this revision.Feb 23 2018, 9:39 PM
This revision is now accepted and ready to land.Feb 23 2018, 9:39 PM
Closed by commit rHGa72198790e15: show: use the new stack definition for show stack (authored by lothiraldan). · Explain WhyMar 19 2018, 4:06 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Mar 21 2018, 10:17 AM
yuja added inline comments.
mercurial/destutil.py
16

Style nit: missing comma

Revision Contents
Changeset List

PathPackages
Mmercurial/destutil.py (5 lines)

Diff 6011

mercurial/destutil.py

# destutil.py - Mercurial utility function for command destination # destutil.py - Mercurial utility function for command destination
# #
# Copyright Matt Mackall <mpm@selenic.com> and other # Copyright Matt Mackall <mpm@selenic.com> and other
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from .i18n import _ from .i18n import _
from . import ( from . import (
bookmarks, bookmarks,
error, error,
obsutil, obsutil,
scmutil, scmutil,
stack
yujaUnsubmitted
Not Done

Style nit: missing comma

yuja: Style nit: missing comma
) )
def _destupdateobs(repo, clean): def _destupdateobs(repo, clean):
"""decide of an update destination from obsolescence markers""" """decide of an update destination from obsolescence markers"""
node = None node = None
wc = repo[None] wc = repo[None]
p1 = wc.p1() p1 = wc.p1()
movemark = None movemark = None
# The revset supplied by the user may not be in ascending order nor # The revset supplied by the user may not be in ascending order nor
# take the first revision. So do this manually. # take the first revision. So do this manually.
revs.sort() revs.sort()
return revs.first() return revs.first()
return None return None
def stackbase(ui, repo): def stackbase(ui, repo):
# The histedit default base stops at public changesets, branchpoints, revs = stack.getstack(repo)
# and merges, which is exactly what we want for a stack.
revs = scmutil.revrange(repo, [histeditdefaultrevset])
return revs.last() if revs else None return revs.last() if revs else None
def _statusotherbook(ui, repo): def _statusotherbook(ui, repo):
bmheads = bookmarks.headsforactive(repo) bmheads = bookmarks.headsforactive(repo)
curhead = repo[repo._activebookmark].node() curhead = repo[repo._activebookmark].node()
if repo.revs('%n and parents()', curhead): if repo.revs('%n and parents()', curhead):
# we are on the active bookmark # we are on the active bookmark
bmheads = [b for b in bmheads if curhead != b] bmheads = [b for b in bmheads if curhead != b]