Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
evolve
Commits
883df7f06f2e
Commit
883df7f0
authored
Apr 29, 2020
by
Anton Shestakov
Browse files
obshistory: create _fatemarkers() similar to _originmarkers()
parent
e8660b28bfee
Changes
1
Hide whitespace changes
Inline
Side-by-side
hgext3rd/evolve/obshistory.py
View file @
883df7f0
...
@@ -213,6 +213,20 @@
...
@@ -213,6 +213,20 @@
if
not
marker
[
1
]:
if
not
marker
[
1
]:
yield
((),
(
marker
,))
yield
((),
(
marker
,))
def
_fatemarkers
(
repo
,
ctx
,
filternonlocal
):
successors
=
repo
.
obsstore
.
successors
if
filternonlocal
:
r
=
obsutil
.
successorsandmarkers
(
repo
,
ctx
)
if
r
is
None
:
r
=
[]
for
succset
in
sorted
(
r
):
if
succset
[
b
'markers'
]:
yield
(
succset
[
b
'successors'
],
succset
[
b
'markers'
])
else
:
markers
=
successors
.
get
(
ctx
.
node
(),
())
for
marker
in
sorted
(
markers
):
yield
(
marker
[
1
],
[
marker
])
def
_nodesandmarkers
(
repo
,
ctx
,
filternonlocal
,
origin
):
def
_nodesandmarkers
(
repo
,
ctx
,
filternonlocal
,
origin
):
""" Return data for obslog and obsolescence-related template keywords.
""" Return data for obslog and obsolescence-related template keywords.
...
@@ -227,17 +241,8 @@
...
@@ -227,17 +241,8 @@
for
(
nodes
,
markers
)
in
_originmarkers
(
repo
,
ctx
,
filternonlocal
):
for
(
nodes
,
markers
)
in
_originmarkers
(
repo
,
ctx
,
filternonlocal
):
yield
(
nodes
,
markers
)
yield
(
nodes
,
markers
)
else
:
else
:
if
filternonlocal
:
for
(
nodes
,
markers
)
in
_fatemarkers
(
repo
,
ctx
,
filternonlocal
):
r
=
obsutil
.
successorsandmarkers
(
repo
,
ctx
)
yield
(
nodes
,
markers
)
if
r
is
None
:
r
=
[]
for
succset
in
sorted
(
r
):
if
succset
[
b
'markers'
]:
yield
(
succset
[
b
'successors'
],
succset
[
b
'markers'
])
else
:
markers
=
repo
.
obsstore
.
successors
.
get
(
ctx
.
node
(),
())
for
marker
in
sorted
(
markers
):
yield
(
marker
[
1
],
[
marker
])
class
obsmarker_printer
(
logcmdutil
.
changesetprinter
):
class
obsmarker_printer
(
logcmdutil
.
changesetprinter
):
"""show (available) information about a node
"""show (available) information about a node
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment