Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
evolve
Manage
Activity
Members
Labels
Code
Merge requests
30
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
evolve
Merge requests
!132
Topic/stable/evolve split nonlinear
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Topic/stable/evolve split nonlinear
topic/stable/evolve-split-nonlinear
into
branch/default
Overview
0
Commits
12
Pipelines
1
Changes
16
Closed
Pierre-Yves David
requested to merge
topic/stable/evolve-split-nonlinear
into
branch/default
4 years ago
Overview
0
Commits
12
Pipelines
1
Changes
16
Expand
same as
!123 (closed)
bu on stable.
👍
0
👎
0
Merge request reports
Compare
branch/default
branch/default (base)
and
latest version
latest version
097c3a6a
12 commits,
4 years ago
16 files
+
235
−
40
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
16
Search (e.g. *.vue) (Ctrl+P)
hgext3rd/evolve/obsdiscovery.py
+
14
−
3
Options
@@ -844,7 +844,12 @@ def buildpullobsmarkersboundaries(pullop, bundle2=True):
repo
=
pullop
.
repo
remote
=
pullop
.
remote
unfi
=
repo
.
unfiltered
()
revs
=
unfi
.
revs
(
b
'
::(%ln - null)
'
,
pullop
.
common
)
# Also exclude filtered revisions. Working on unfiltered repository can
# give a bit more precise view of the repository. However it makes the
# overall operation more complicated.
filteredrevs
=
repo
.
changelog
.
filteredrevs
# XXX probably not very efficient
revs
=
unfi
.
revs
(
b
'
::(%ln - null) - %ld
'
,
pullop
.
common
,
filteredrevs
)
boundaries
=
{
b
'
heads
'
:
pullop
.
pulledsubset
}
if
not
revs
:
# nothing common
boundaries
[
b
'
common
'
]
=
[
node
.
nullid
]
@@ -859,8 +864,14 @@ def buildpullobsmarkersboundaries(pullop, bundle2=True):
if
bundle2
and
_canobshashrange
(
repo
,
remote
):
obsexcmsg
(
repo
.
ui
,
b
"
looking for common markers in %i nodes
\n
"
%
len
(
revs
))
boundaries
[
b
'
missing
'
]
=
findmissingrange
(
repo
.
ui
,
unfi
,
pullop
.
remote
,
revs
)
missing
=
findmissingrange
(
repo
.
ui
,
repo
,
pullop
.
remote
,
revs
)
boundaries
[
b
'
missing
'
]
=
missing
# using getattr since `limitedarguments` is missing
# hg <= 5.0 (69921d02daaf)
if
getattr
(
pullop
.
remote
,
'
limitedarguments
'
,
False
):
# prepare for a possible fallback to common
common
=
repo
.
set
(
"
heads(only(%ld, %ln))
"
,
revs
,
missing
)
boundaries
[
b
'
common
'
]
=
[
c
.
node
()
for
c
in
common
]
else
:
boundaries
[
b
'
common
'
]
=
[
node
.
nullid
]
return
boundaries
Loading