This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2399

stack: return a sorted smartrev by default
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG68fcc5503ec5: stack: return a sorted smartrev by default
Summary

Most stack customers will display a list of revisions, sort it by default.

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 requested changes to this revision.Feb 23 2018, 9:41 PM
indygreg added a subscriber: indygreg.

Looks good. But only marking as needing changes because I think we may get rid of hg debugstack.

This revision now requires changes to proceed.Feb 23 2018, 9:41 PM
lothiraldan updated this revision to Diff 6215.Feb 28 2018, 6:59 PM
indygreg accepted this revision.Mar 19 2018, 4:02 PM
This revision is now accepted and ready to land.Mar 19 2018, 4:02 PM
Closed by commit rHG68fcc5503ec5: stack: return a sorted smartrev by default (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:26 AM
yuja added inline comments.
mercurial/stack.py
22

reverse() can be removed as well?

lothiraldan marked an inline comment as done.Apr 5 2018, 11:53 AM
lothiraldan added inline comments.
mercurial/stack.py
22

reverse is removed in the next commit https://phab.mercurial-scm.org/D2400

lothiraldan marked an inline comment as done.Apr 5 2018, 12:17 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/destutil.py (2 lines)
Mmercurial/stack.py (8 lines)
Mtests/test-stack.t (14 lines)

Diff 6013

mercurial/destutil.py

# 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):
revs = stack.getstack(repo) revs = stack.getstack(repo)
return revs.last() if revs else None 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:

mercurial/stack.py

# stack.py - Mercurial functions for stack definition # stack.py - Mercurial functions for stack definition
# #
# 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 . import revsetlang, scmutil from . import revsetlang, scmutil
def getstack(repo, rev=None): def getstack(repo, rev=None):
"""return a smartrev of the stack containing either rev if it is not None """return a sorted smartrev of the stack containing either rev if it is
or the current working directory parent. not None or the current working directory parent.
The stack will always contain all drafts changesets which are ancestors to The stack will always contain all drafts changesets which are ancestors to
the revision and are not merges. the revision and are not merges.
""" """
if rev is None: if rev is None:
rev = '.' rev = '.'
revspec = 'reverse(only(%s) and not public() and not ::merge())' revspec = 'reverse(only(%s) and not public() and not ::merge())'
yujaUnsubmitted
Done

reverse() can be removed as well?

yuja: `reverse()` can be removed as well?
lothiraldanAuthorUnsubmitted
Not Done

reverse is removed in the next commit https://phab.mercurial-scm.org/D2400

lothiraldan: reverse is removed in the next commit https://phab.mercurial-scm.org/D2400
revset = revsetlang.formatspec(revspec, rev) revset = revsetlang.formatspec(revspec, rev)
return scmutil.revrange(repo, [revset]) revisions = scmutil.revrange(repo, [revset])
revisions.sort()
return revisions

tests/test-stack.t

Check that stack doesn't include public changesets Check that stack doesn't include public changesets
-------------------------------------------------- --------------------------------------------------
$ hg up other $ hg up other
0 files updated, 0 files merged, 4 files removed, 0 files unresolved 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ hg debugstack $ hg debugstack
1
0 0
1
$ hg phase --public 'branch("other")' $ hg phase --public 'branch("other")'
$ hg debugstack $ hg debugstack
$ hg up foo $ hg up foo
4 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Simple test Simple test
----------- -----------
'hg debugstack' list all changeset in the branch 'hg debugstack' list all changeset in the branch
$ hg branch $ hg branch
foo foo
$ hg debugstack $ hg debugstack
5
4
3
2 2
3
4
5
Case with some of the branch unstable Case with some of the branch unstable
------------------------------------ ------------------------------------
$ hg up 3 $ hg up 3
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bbb > ddd $ echo bbb > ddd
$ hg commit --amend $ hg commit --amend
| |
o 0 other public c_a o 0 other public c_a
$ hg debugstack $ hg debugstack
6 6
$ hg up -r "desc(c_e)" $ hg up -r "desc(c_e)"
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg debugstack $ hg debugstack
4
3 3
4
$ hg up -r "desc(c_d)" $ hg up -r "desc(c_d)"
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugstack $ hg debugstack
6 6
Case with multiple topological heads Case with multiple topological heads
------------------------------------ ------------------------------------
o 1 other public c_b o 1 other public c_b
| |
o 0 other public c_a o 0 other public c_a
Test output Test output
$ hg debugstack $ hg debugstack
10
9 9
10
$ hg up 'desc(c_f)' $ hg up 'desc(c_f)'
2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg debugstack $ hg debugstack
8
7 7
8
Case with multiple heads with unstability involved Case with multiple heads with unstability involved
-------------------------------------------------- --------------------------------------------------
We amend the message to make sure the display base pick the right changeset We amend the message to make sure the display base pick the right changeset
$ hg up 'desc(c_d)' $ hg up 'desc(c_d)'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved