Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
mercurial-devel
Commits
fa159bb4
Commit
fa159bb4
authored
3 years ago
by
Martin von Zweigbergk
Browse files
Options
Downloads
Patches
Plain Diff
simplemerge: avoid a call to `pycompat.strkwargs()`
Differential Revision:
https://phab.mercurial-scm.org/D11886
parent
58a3be48
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mercurial/simplemerge.py
+9
-11
9 additions, 11 deletions
mercurial/simplemerge.py
with
9 additions
and
11 deletions
mercurial/simplemerge.py
+
9
−
11
View file @
fa159bb4
...
...
@@ -516,7 +516,7 @@
m3
=
Merge3Text
(
basetext
,
localtext
,
othertext
)
extrakwargs
=
{
b
"
localorother
"
:
opts
.
get
(
"
localorother
"
,
None
),
b
'
minimize
'
:
True
,
"
localorother
"
:
opts
.
get
(
"
localorother
"
,
None
),
'
minimize
'
:
True
,
}
if
mode
==
b
'
union
'
:
...
...
@@ -521,6 +521,6 @@
}
if
mode
==
b
'
union
'
:
extrakwargs
[
b
'
start_marker
'
]
=
None
extrakwargs
[
b
'
mid_marker
'
]
=
None
extrakwargs
[
b
'
end_marker
'
]
=
None
extrakwargs
[
'
start_marker
'
]
=
None
extrakwargs
[
'
mid_marker
'
]
=
None
extrakwargs
[
'
end_marker
'
]
=
None
elif
name_base
is
not
None
:
...
...
@@ -526,9 +526,9 @@
elif
name_base
is
not
None
:
extrakwargs
[
b
'
base_marker
'
]
=
b
'
|||||||
'
extrakwargs
[
b
'
name_base
'
]
=
name_base
extrakwargs
[
b
'
minimize
'
]
=
False
extrakwargs
[
'
base_marker
'
]
=
b
'
|||||||
'
extrakwargs
[
'
name_base
'
]
=
name_base
extrakwargs
[
'
minimize
'
]
=
False
if
mode
==
b
'
mergediff
'
:
lines
,
conflicts
=
_mergediff
(
m3
,
name_a
,
name_b
,
name_base
)
else
:
lines
=
list
(
...
...
@@ -530,11 +530,9 @@
if
mode
==
b
'
mergediff
'
:
lines
,
conflicts
=
_mergediff
(
m3
,
name_a
,
name_b
,
name_base
)
else
:
lines
=
list
(
m3
.
merge_lines
(
name_a
=
name_a
,
name_b
=
name_b
,
**
pycompat
.
strkwargs
(
extrakwargs
)
)
m3
.
merge_lines
(
name_a
=
name_a
,
name_b
=
name_b
,
**
extrakwargs
)
)
conflicts
=
m3
.
conflicts
and
not
mode
==
b
'
union
'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment