This instance was upgraded to Heptapod 0.27.2 on 2021-12-08 at 22:00 UTC+1

Commit 92f20ed2 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

branching: merge with stable

Pipeline #11946 passed with stage
in 3 minutes and 59 seconds
......@@ -76,7 +76,7 @@ def topicset(repo, subset, x):
@revsetpredicate(b'ngtip([branch])')
def ngtipset(repo, subset, x):
"""The untopiced tip.
"""The tip of a branch, ignoring changesets with a topic.
Name is horrible so that people change it.
"""
......@@ -85,7 +85,9 @@ def ngtipset(repo, subset, x):
branch = revset.getstring(args[0], b'ngtip requires a string')
if branch == b'.':
branch = repo[b'.'].branch()
return subset & revset.baseset(destination.ngtip(repo, branch))
# list of length 1
revs = [repo[node].rev() for node in destination.ngtip(repo, branch)]
return subset & revset.baseset(revs)
@revsetpredicate(b'stack()')
def stackset(repo, subset, x):
......
......@@ -42,8 +42,10 @@ Simple linear case
|
o 0 () c_alpha
$ hg log -r 'ngtip(.)'
3 () c_delta
$ hg log -G -r 'ngtip(.)'
o 3 () c_delta
|
~
$ hg log -r 'default'
3 () c_delta
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment