facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

filemerge: add internal:dump

Browse Source 
This create foo.{local,other,base} files for people to manually merge
files while littering their working directory.
This commit is contained in:
Matt Mackall 2009-06-18 16:56:03 -05:00
parent 48da4c1c20
commit fed8f4af82
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mercurial/filemerge.py
View File

@ -16,7 +16,8 @@ def _toolstr(ui, tool, part, default=""):
def _toolbool(ui, tool, part, default=False):
return ui.configbool("merge-tools", tool + "." + part, default)
_internal = ['internal:' + s for s in 'fail local other merge prompt'.split()]
_internal = ['internal:' + s
for s in 'fail local other merge prompt dump'.split()]
def _findtool(ui, tool):
if tool in _internal:
@ -191,6 +192,12 @@ def filemerge(repo, mynode, orig, fcd, fco, fca):
if tool == "internal:merge":
r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other'])
elif tool == 'internal:dump':
a = repo.wjoin(fd)
util.copyfile(a, a + ".local")
repo.wwrite(a + ".other", fco.data(), fco.flags())
repo.wwrite(a + ".base", fca.data(), fca.flags())
return 1 # unresolved
else:
args = _toolstr(ui, tool, "args", '$local $base $other')
if "$output" in args: