This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2403

stack: remove destutil.stackbase
AbandonedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Use directly stack.getstack in show stack command. Remove destutil.stackbase.
Import a TODO from the show stack in the code.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Feb 23 2018, 5:37 AM
indygreg added a subscriber: indygreg.Feb 23 2018, 9:44 PM

Oh, I guess the series never did formerly define a revset for stack :/

I think there is room for one. We have the ability to mark revsets as experimental or internal, right? Could/should we do that so we don't need hg debugstack?

Anyway, I could probably queue this with some minor rework. But I'm going to hold off a bit and see if others have opinions.

lothiraldan updated this revision to Diff 6219.Feb 28 2018, 6:59 PM
lothiraldan added a comment.Mar 1 2018, 3:00 PM
In D2403#39460, @indygreg wrote:

Oh, I guess the series never did formerly define a revset for stack :/
I think there is room for one. We have the ability to mark revsets as experimental or internal, right? Could/should we do that so we don't need hg debugstack?
Anyway, I could probably queue this with some minor rework. But I'm going to hold off a bit and see if others have opinions.

I have updated the series without using debugstack, thank you for the suggestion. I thought revset would were much harder to implement but turn out not so much harder.

lothiraldan abandoned this revision.Oct 5 2019, 12:03 PM

Revision Contents
Changeset List

PathPackages
Mhgext/show.py (12 lines)
Mmercurial/destutil.py (4 lines)

Diff 7736

hgext/show.py

from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
hex, hex,
nullrev, nullrev,
) )
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
commands, commands,
destutil,
error, error,
formatter, formatter,
graphmod, graphmod,
logcmdutil, logcmdutil,
phases, phases,
pycompat, pycompat,
registrar, registrar,
revset, revset,
revsetlang, revsetlang,
stack
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
raise error.Abort(_('stack view only available when there is a ' raise error.Abort(_('stack view only available when there is a '
'working directory')) 'working directory'))
if wdirctx.phase() == phases.public: if wdirctx.phase() == phases.public:
ui.write(_('(empty stack; working directory parent is a published ' ui.write(_('(empty stack; working directory parent is a published '
'changeset)\n')) 'changeset)\n'))
return return
# TODO extract "find stack" into a function to facilitate
# customization and reuse.
baserev = destutil.stackbase(ui, repo)
basectx = None basectx = None
_stack = stack.getstack(repo)
baserev = _stack.first()
# TODO doesn't yet handle case where wdir is a draft merge
if baserev is None: if baserev is None:
baserev = wdirctx.rev() baserev = wdirctx.rev()
stackrevs = {wdirctx.rev()} stackrevs = {wdirctx.rev()}
else: else:
stackrevs = set(repo.revs('%d::.', baserev)) stackrevs = set(_stack)
ctx = repo[baserev] ctx = repo[baserev]
if ctx.p1().rev() != nullrev: if ctx.p1().rev() != nullrev:
basectx = ctx.p1() basectx = ctx.p1()
# And relevant descendants. # And relevant descendants.
branchpointattip = False branchpointattip = False
cl = repo.changelog cl = repo.changelog

mercurial/destutil.py

if revs: if revs:
# 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):
revs = stack.getstack(repo)
return revs.first() 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]
if bmheads: if bmheads:
msg = _('%i other divergent bookmarks for "%s"\n') msg = _('%i other divergent bookmarks for "%s"\n')