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
ef21a2c41629
Commit
ef21a2c41629
authored
9 years ago
by
Siddharth Agarwal
Browse files
Options
Downloads
Patches
Plain Diff
filemerge: add a wrapper around the filemerge function
We'll introduce a separate premerge function that calls the same code.
parent
a3fcc8e3136b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hgext/largefiles/uisetup.py
+1
-1
1 addition, 1 deletion
hgext/largefiles/uisetup.py
mercurial/filemerge.py
+4
-1
4 additions, 1 deletion
mercurial/filemerge.py
with
5 additions
and
2 deletions
hgext/largefiles/uisetup.py
+
1
−
1
View file @
ef21a2c4
...
...
@@ -102,7 +102,7 @@
overrides
.
mergerecordupdates
)
entry
=
extensions
.
wrapfunction
(
merge
,
'
update
'
,
overrides
.
mergeupdate
)
entry
=
extensions
.
wrapfunction
(
filemerge
,
'
filemerge
'
,
entry
=
extensions
.
wrapfunction
(
filemerge
,
'
_
filemerge
'
,
overrides
.
overridefilemerge
)
entry
=
extensions
.
wrapfunction
(
cmdutil
,
'
copy
'
,
overrides
.
overridecopy
)
...
...
This diff is collapsed.
Click to expand it.
mercurial/filemerge.py
+
4
−
1
View file @
ef21a2c4
...
...
@@ -435,7 +435,7 @@
newlabels
.
append
(
_formatconflictmarker
(
repo
,
ca
,
tmpl
,
labels
[
2
],
pad
))
return
newlabels
def
filemerge
(
repo
,
mynode
,
orig
,
fcd
,
fco
,
fca
,
labels
=
None
):
def
_
filemerge
(
repo
,
mynode
,
orig
,
fcd
,
fco
,
fca
,
labels
=
None
):
"""
perform a 3-way merge in the working directory
mynode = parent node before merge
...
...
@@ -567,5 +567,8 @@
return
r
def
filemerge
(
repo
,
mynode
,
orig
,
fcd
,
fco
,
fca
,
labels
=
None
):
return
_filemerge
(
repo
,
mynode
,
orig
,
fcd
,
fco
,
fca
,
labels
=
labels
)
# tell hggettext to extract docstrings from these functions:
i18nfunctions
=
internals
.
values
()
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