Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
evolve
Commits
1e2f3fa129f2
Commit
1e2f3fa1
authored
Mar 16, 2020
by
Anton Shestakov
Browse files
obshistory: prepare data for displaymarkers() in a separate function
parent
292de4cca111
Pipeline
#5298
passed with stage
in 5 minutes and 24 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
hgext3rd/evolve/obshistory.py
View file @
1e2f3fa1
...
...
@@ -136,6 +136,19 @@
b
"patch"
:
TEMPLATE_PATCH
,
}
def
_nodesandmarkers
(
repo
,
ctx
,
filternonlocal
):
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
=
repo
.
obsstore
.
successors
.
get
(
ctx
.
node
(),
())
for
marker
in
sorted
(
markers
):
yield
(
marker
[
1
],
[
marker
])
class
obsmarker_printer
(
logcmdutil
.
changesetprinter
):
"""show (available) information about a node
...
...
@@ -173,28 +186,10 @@
markerfm
=
fm
.
nested
(
b
"markers"
)
# Succs markers
if
self
.
filter
is
False
:
succs
=
self
.
repo
.
obsstore
.
successors
.
get
(
changenode
,
())
succs
=
sorted
(
succs
)
for
successor
in
succs
:
displaymarkers
(
self
.
ui
,
markerfm
,
successor
[
1
],
[
successor
],
ctx
.
node
(),
self
.
repo
,
self
.
_includediff
)
else
:
r
=
obsutil
.
successorsandmarkers
(
self
.
repo
,
ctx
)
if
r
is
None
:
r
=
[]
for
succset
in
sorted
(
r
):
markers
=
succset
[
b
"markers"
]
if
not
markers
:
continue
successors
=
succset
[
b
"successors"
]
displaymarkers
(
self
.
ui
,
markerfm
,
successors
,
markers
,
ctx
.
node
(),
self
.
repo
,
self
.
_includediff
)
data
=
_nodesandmarkers
(
self
.
repo
,
ctx
,
self
.
filter
)
for
nodes
,
markers
in
data
:
displaymarkers
(
self
.
ui
,
markerfm
,
nodes
,
markers
,
ctx
.
node
(),
self
.
repo
,
self
.
_includediff
)
markerfm
.
end
()
...
...
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