This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2395

stack: add a new module for stack-related commands
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG40583c7afd63: stack: add a new module for stack-related commands
Summary

Bootstrap the module with a function that returns the stack for the current
revision. The definition of the stack is ihnerited from histedit default
revset and used by hg show stack.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Feb 23 2018, 5:36 AM
indygreg requested changes to this revision.Feb 23 2018, 9:36 PM
indygreg added a subscriber: indygreg.

Requires a minor style change. But I like where this is going...

mercurial/stack.py
11

Nit: this doesn't following our import conventions. This should be:

from . import (
    revsetlang,
    scmutil,
)
This revision now requires changes to proceed.Feb 23 2018, 9:36 PM
lothiraldan updated this revision to Diff 6212.Feb 28 2018, 6:59 PM
indygreg requested changes to this revision.Mar 8 2018, 1:28 AM

I assume this stack will get a post-sprint refresh. So I'm going to wait on that before reviewing.

This revision now requires changes to proceed.Mar 8 2018, 1:28 AM
lothiraldan added a comment.Mar 12 2018, 6:42 AM

I don't remember a particular point that needed to be cleaned before merging this series. I think the next steps are to introduce a Stack object, update core commands to works with stacks and introduce new commands related to stacks according to my memories and sprint notes.

Do you have specific in mind that needs to be cleaned that I can't remember?

indygreg accepted this revision.Mar 19 2018, 3:47 PM
This revision is now accepted and ready to land.Mar 19 2018, 3:47 PM
Closed by commit rHG40583c7afd63: stack: add a new module for stack-related commands (authored by lothiraldan). · Explain WhyMar 19 2018, 4:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
AMmercurial/stack.py (27 lines)

Diff 7124

mercurial/stack.py

  • This file was added.
# stack.py - Mercurial functions for stack definition
#
# Copyright Matt Mackall <mpm@selenic.com> and other
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from . import (
revsetlang,
indygregUnsubmitted
Not Done

Nit: this doesn't following our import conventions. This should be:

from . import (
    revsetlang,
    scmutil,
)
indygreg: Nit: this doesn't following our import conventions. This should be: ```from . import…
scmutil,
)
def getstack(repo, rev=None):
"""return a smartrev of the stack containing either rev if it is not None
or the current working directory parent.
The stack will always contain all drafts changesets which are ancestors to
the revision and are not merges.
"""
if rev is None:
rev = '.'
revspec = 'reverse(only(%s) and not public() and not ::merge())'
revset = revsetlang.formatspec(revspec, rev)
return scmutil.revrange(repo, [revset])