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
e8302f760a54
Commit
e8302f76
authored
Nov 13, 2019
by
Anton Shestakov
Browse files
compat: compatibility for cl.nodemap.get vs cl.index.get_rev
parent
0fe5d74134d6
Pipeline
#1144
passed with stage
in 4 minutes and 51 seconds
Changes
10
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
hgext3rd/evolve/__init__.py
View file @
e8302f76
...
...
@@ -525,10 +525,10 @@
def
_precursors
(
repo
,
s
,
includeidentical
=
False
):
"""Precursor of a changeset"""
cs
=
set
()
nm
=
repo
.
changelog
.
nodemap
getrev
=
compat
.
getgetrev
(
repo
.
changelog
)
markerbysubj
=
repo
.
obsstore
.
predecessors
node
=
repo
.
changelog
.
node
for
r
in
s
:
for
p
in
markerbysubj
.
get
(
node
(
r
),
()):
if
not
includeidentical
and
p
[
2
]
&
rewind
.
identicalflag
:
continue
...
...
@@ -529,10 +529,10 @@
markerbysubj
=
repo
.
obsstore
.
predecessors
node
=
repo
.
changelog
.
node
for
r
in
s
:
for
p
in
markerbysubj
.
get
(
node
(
r
),
()):
if
not
includeidentical
and
p
[
2
]
&
rewind
.
identicalflag
:
continue
pr
=
nm
.
get
(
p
[
0
])
pr
=
get
rev
(
p
[
0
])
if
pr
is
not
None
:
cs
.
add
(
pr
)
cs
-=
repo
.
changelog
.
filteredrevs
# nodemap has no filtering
...
...
@@ -551,6 +551,6 @@
if
np
not
in
seen
:
seen
.
add
(
np
)
toproceed
.
append
(
np
)
nm
=
repo
.
changelog
.
nodemap
getrev
=
compat
.
getgetrev
(
repo
.
changelog
)
cs
=
set
()
for
p
in
seen
:
...
...
@@ -555,6 +555,6 @@
cs
=
set
()
for
p
in
seen
:
pr
=
nm
.
get
(
p
)
pr
=
get
rev
(
p
)
if
pr
is
not
None
:
cs
.
add
(
pr
)
cs
-=
repo
.
changelog
.
filteredrevs
# nodemap has no filtering
...
...
@@ -564,8 +564,8 @@
"""Successors of a changeset"""
cs
=
set
()
node
=
repo
.
changelog
.
node
nm
=
repo
.
changelog
.
nodemap
getrev
=
compat
.
getgetrev
(
repo
.
changelog
)
markerbyobj
=
repo
.
obsstore
.
successors
for
r
in
s
:
for
p
in
markerbyobj
.
get
(
node
(
r
),
()):
for
sub
in
p
[
1
]:
...
...
@@ -568,8 +568,8 @@
markerbyobj
=
repo
.
obsstore
.
successors
for
r
in
s
:
for
p
in
markerbyobj
.
get
(
node
(
r
),
()):
for
sub
in
p
[
1
]:
sr
=
nm
.
get
(
sub
)
sr
=
get
rev
(
sub
)
if
sr
is
not
None
:
cs
.
add
(
sr
)
cs
-=
repo
.
changelog
.
filteredrevs
# nodemap has no filtering
...
...
@@ -595,6 +595,6 @@
if
sub
not
in
seen
:
seen
.
add
(
sub
)
toproceed
.
append
(
sub
)
nm
=
repo
.
changelog
.
nodemap
getrev
=
compat
.
getgetrev
(
repo
.
changelog
)
cs
=
set
()
for
s
in
seen
:
...
...
@@ -599,6 +599,6 @@
cs
=
set
()
for
s
in
seen
:
sr
=
nm
.
get
(
s
)
sr
=
get
rev
(
s
)
if
sr
is
not
None
:
cs
.
add
(
sr
)
cs
-=
repo
.
changelog
.
filteredrevs
# nodemap has no filtering
...
...
hgext3rd/evolve/compat.py
View file @
e8302f76
...
...
@@ -522,3 +522,11 @@
if
meta
.
get
(
b
'operation'
))
return
sorted
(
operations
)
# nodemap.get and index.[has_node|rev|get_rev]
# hg <= 5.3 (02802fa87b74)
def
getgetrev
(
cl
):
"""Returns index.get_rev or nodemap.get (for pre-5.3 Mercurial)."""
if
util
.
safehasattr
(
cl
.
index
,
'get_rev'
):
return
cl
.
index
.
get_rev
return
cl
.
nodemap
.
get
hgext3rd/evolve/dagutil.py
View file @
e8302f76
...
...
@@ -13,6 +13,8 @@
from
mercurial.i18n
import
_
from
mercurial.node
import
nullrev
from
.
import
compat
class
basedag
(
object
):
'''generic interface for DAGs
...
...
@@ -145,4 +147,5 @@
def
_internalizeall
(
self
,
ids
,
filterunknown
):
rl
=
self
.
_revlog
getrev
=
compat
.
getgetrev
(
rl
)
if
filterunknown
:
...
...
@@ -148,5 +151,5 @@
if
filterunknown
:
return
[
r
for
r
in
map
(
rl
.
nodemap
.
get
,
ids
)
return
[
r
for
r
in
map
(
get
rev
,
ids
)
if
(
r
is
not
None
and
r
!=
nullrev
and
r
not
in
rl
.
filteredrevs
)]
...
...
hgext3rd/evolve/debugcmd.py
View file @
e8302f76
...
...
@@ -17,7 +17,10 @@
from
mercurial.i18n
import
_
from
.
import
exthelper
from
.
import
(
compat
,
exthelper
,
)
eh
=
exthelper
.
exthelper
()
...
...
@@ -43,7 +46,7 @@
store
=
repo
.
obsstore
unfi
=
repo
.
unfiltered
()
nm
=
unfi
.
changelog
.
nodemap
getrev
=
compat
.
getgetrev
(
unfi
.
changelog
)
nbmarkers
=
len
(
store
.
_all
)
ui
.
write
(
_
(
b
'markers total: %9i
\n
'
)
%
nbmarkers
)
sucscount
=
[
0
,
0
,
0
,
0
]
...
...
@@ -58,7 +61,7 @@
size_v0
=
[]
size_v1
=
[]
for
mark
in
store
:
if
mark
[
0
]
i
n
nm
:
if
getrev
(
mark
[
0
]
)
i
s
not
None
:
known
+=
1
nbsucs
=
len
(
mark
[
1
])
sucscount
[
min
(
nbsucs
,
3
)]
+=
1
...
...
@@ -133,7 +136,7 @@
ui
.
write
(
b
' any known node: %9i
\n
'
%
len
([
c
for
c
in
allclusters
if
[
n
for
n
in
c
[
0
]
if
nm
.
get
(
n
)
is
not
None
]]))
if
[
n
for
n
in
c
[
0
]
if
get
rev
(
n
)
is
not
None
]]))
if
allclusters
:
nbcluster
=
len
(
allclusters
)
ui
.
write
((
b
' smallest length: %9i
\n
'
%
len
(
allclusters
[
0
][
1
])))
...
...
@@ -148,7 +151,7 @@
ui
.
write
((
b
' using parents data: %9i
\n
'
%
len
(
allpclusters
)))
ui
.
write
(
b
' any known node: %9i
\n
'
%
len
([
c
for
c
in
allclusters
if
[
n
for
n
in
c
[
0
]
if
nm
.
get
(
n
)
is
not
None
]]))
if
[
n
for
n
in
c
[
0
]
if
get
rev
(
n
)
is
not
None
]]))
if
allpclusters
:
nbcluster
=
len
(
allpclusters
)
ui
.
write
((
b
' smallest length: %9i
\n
'
...
...
hgext3rd/evolve/obscache.py
View file @
e8302f76
...
...
@@ -20,6 +20,7 @@
)
from
.
import
(
compat
,
exthelper
,
)
...
...
@@ -389,5 +390,5 @@
def
_updatemarkers
(
self
,
repo
,
obsmarkers
):
"""update the cache with new markers"""
rev
=
repo
.
changelog
.
nodemap
.
get
get
rev
=
compat
.
getgetrev
(
repo
.
changelog
)
for
m
in
obsmarkers
:
...
...
@@ -393,5 +394,5 @@
for
m
in
obsmarkers
:
r
=
rev
(
m
[
0
])
r
=
get
rev
(
m
[
0
])
if
r
is
not
None
:
self
.
_data
[
r
]
=
1
...
...
hgext3rd/evolve/obsdiscovery.py
View file @
e8302f76
...
...
@@ -414,8 +414,8 @@
max_stored
=
con
.
execute
(
_query_max_stored
).
fetchall
()[
0
][
0
]
affected_nodes
=
_affectedby
(
repo
,
obsmarkers
)
rev
=
repo
.
changelog
.
nodemap
.
get
affected
=
[
rev
(
n
)
for
n
in
affected_nodes
]
get
rev
=
compat
.
getgetrev
(
repo
.
changelog
)
affected
=
[
get
rev
(
n
)
for
n
in
affected_nodes
]
affected
=
[
r
for
r
in
affected
if
r
is
not
None
and
r
<=
max_stored
]
...
...
@@ -646,8 +646,8 @@
The range have the id encoded as a node
return 'wdirid' for unknown range"""
nm
=
repo
.
changelog
.
nodemap
ranges
=
[(
nm
.
get
(
n
),
idx
)
for
n
,
idx
in
ranges
]
getrev
=
compat
.
getgetrev
(
repo
.
changelog
)
ranges
=
[(
get
rev
(
n
),
idx
)
for
n
,
idx
in
ranges
]
if
ranges
:
maxrev
=
max
(
r
for
r
,
i
in
ranges
)
if
maxrev
is
not
None
:
...
...
hgext3rd/pullbundle.py
View file @
e8302f76
...
...
@@ -180,7 +180,7 @@
def
sliceoutgoing
(
repo
,
outgoing
):
cl
=
repo
.
changelog
rev
=
cl
.
nodemap
.
get
rev
=
getgetrev
(
cl
)
node
=
cl
.
node
revsort
=
repo
.
stablesort
...
...
@@ -623,3 +623,11 @@
def
fmtdist
(
name
,
data
):
return
STATSFORMAT
.
format
(
name
=
name
,
**
data
)
# nodemap.get and index.[has_node|rev|get_rev]
# hg <= 5.3 (02802fa87b74)
def
getgetrev
(
cl
):
"""Returns index.get_rev or nodemap.get (for pre-5.3 Mercurial)."""
if
util
.
safehasattr
(
cl
.
index
,
'get_rev'
):
return
cl
.
index
.
get_rev
return
cl
.
nodemap
.
get
hgext3rd/topic/compat.py
View file @
e8302f76
...
...
@@ -10,6 +10,7 @@
from
mercurial
import
(
obsolete
,
pycompat
,
util
,
)
getmarkers
=
None
...
...
@@ -34,3 +35,11 @@
def
branchmapitems
(
branchmap
):
return
branchmap
.
iteritems
()
# py3-transform: on
# nodemap.get and index.[has_node|rev|get_rev]
# hg <= 5.3 (02802fa87b74)
def
getgetrev
(
cl
):
"""Returns index.get_rev or nodemap.get (for pre-5.3 Mercurial)."""
if
util
.
safehasattr
(
cl
.
index
,
'get_rev'
):
return
cl
.
index
.
get_rev
return
cl
.
nodemap
.
get
hgext3rd/topic/discovery.py
View file @
e8302f76
...
...
@@ -45,7 +45,7 @@
publishednode
,
pushop
.
remotephases
.
publicheads
)
rev
=
repo
.
unfiltered
().
changelog
.
nodemap
.
get
get
rev
=
compat
.
getgetrev
(
repo
.
unfiltered
().
changelog
)
def
remotebranchmap
():
# drop topic information from changeset about to be published
...
...
@@ -56,7 +56,7 @@
else
:
namedbranch
=
branch
.
split
(
b
':'
,
1
)[
0
]
for
h
in
heads
:
r
=
rev
(
h
)
r
=
get
rev
(
h
)
if
r
is
not
None
and
r
in
publishedset
:
result
[
namedbranch
].
append
(
h
)
else
:
...
...
hgext3rd/topic/topicmap.py
View file @
e8302f76
...
...
@@ -14,6 +14,7 @@
from
.
import
(
common
,
compat
,
)
basefilter
=
set
([
b
'base'
,
b
'immutable'
])
...
...
@@ -69,6 +70,6 @@
revs
=
set
()
cl
=
repo
.
changelog
fr
=
cl
.
filteredrevs
nm
=
cl
.
nodemap
getrev
=
compat
.
getgetrev
(
cl
)
for
roots
in
repo
.
_phasecache
.
phaseroots
[
1
:]:
for
n
in
roots
:
...
...
@@ -73,6 +74,6 @@
for
roots
in
repo
.
_phasecache
.
phaseroots
[
1
:]:
for
n
in
roots
:
r
=
nm
.
get
(
n
)
r
=
get
rev
(
n
)
if
r
not
in
fr
and
r
<
maxrev
:
revs
.
add
(
r
)
key
=
nullid
...
...
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