This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2888

filemerge: use a single temp dir instead of temp files
ClosedPublic

Authored by spectral on Mar 16 2018, 8:00 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGe349ad5cbb71: filemerge: use a single temp dir instead of temp files
Summary

This can help to remove the clutter from UIs that display just the filenames;
instead of seeing foo~local.C9ru9r.txt and foo~base.2DMV22.txt (in the /tmp
directory on most platforms), we create a single new directory and use that,
producing filenames like /tmp/hgmerge.C9ru9r/foo~local.txt.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (3 lines)
Mmercurial/filemerge.py (25 lines)
Mtests/test-merge-tools.t (41 lines)

Diff 7122

mercurial/configitems.py

default=True, default=True,
) )
coreconfigitem('experimental', 'worddiff', coreconfigitem('experimental', 'worddiff',
default=False, default=False,
) )
coreconfigitem('experimental', 'maxdeltachainspan', coreconfigitem('experimental', 'maxdeltachainspan',
default=-1, default=-1,
) )
coreconfigitem('experimental', 'mergetempdirprefix',
default=None,
)
coreconfigitem('experimental', 'mmapindexthreshold', coreconfigitem('experimental', 'mmapindexthreshold',
default=None, default=None,
) )
coreconfigitem('experimental', 'nonnormalparanoidcheck', coreconfigitem('experimental', 'nonnormalparanoidcheck',
default=False, default=False,
) )
coreconfigitem('experimental', 'exportableenviron', coreconfigitem('experimental', 'exportableenviron',
default=list, default=list,

mercurial/filemerge.py

# filemerge.py - file-level merge handling for Mercurial # filemerge.py - file-level merge handling for Mercurial
# #
# Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import contextlib import contextlib
import os import os
import re import re
import shutil
import tempfile import tempfile
from .i18n import _ from .i18n import _
from .node import nullid, short from .node import nullid, short
from . import ( from . import (
encoding, encoding,
error, error,
# the backup context regardless of where it lives. # the backup context regardless of where it lives.
return context.arbitraryfilectx(back, repo=repo) return context.arbitraryfilectx(back, repo=repo)
@contextlib.contextmanager @contextlib.contextmanager
def _maketempfiles(repo, fco, fca): def _maketempfiles(repo, fco, fca):
"""Writes out `fco` and `fca` as temporary files, so an external merge """Writes out `fco` and `fca` as temporary files, so an external merge
tool may use them. tool may use them.
""" """
tmproot = None
tmprootprefix = repo.ui.config('experimental', 'mergetempdirprefix')
if tmprootprefix:
tmproot = tempfile.mkdtemp(prefix=tmprootprefix)
def temp(prefix, ctx): def temp(prefix, ctx):
fullbase, ext = os.path.splitext(ctx.path()) fullbase, ext = os.path.splitext(ctx.path())
pre = "%s~%s." % (os.path.basename(fullbase), prefix) pre = "%s~%s" % (os.path.basename(fullbase), prefix)
(fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) if tmproot:
data = repo.wwritedata(ctx.path(), ctx.data()) name = os.path.join(tmproot, pre)
if ext:
name += ext
f = open(name, r"wb")
else:
(fd, name) = tempfile.mkstemp(prefix=pre + '.', suffix=ext)
f = os.fdopen(fd, r"wb") f = os.fdopen(fd, r"wb")
data = repo.wwritedata(ctx.path(), ctx.data())
f.write(data) f.write(data)
f.close() f.close()
return name return name
b = temp("base", fca) b = temp("base", fca)
c = temp("other", fco) c = temp("other", fco)
try: try:
yield b, c yield b, c
finally: finally:
if tmproot:
shutil.rmtree(tmproot)
else:
util.unlink(b) util.unlink(b)
util.unlink(c) util.unlink(c)
def _filemerge(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def _filemerge(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
"""perform a 3-way merge in the working directory """perform a 3-way merge in the working directory
premerge = whether this is a premerge premerge = whether this is a premerge
mynode = parent node before merge mynode = parent node before merge
orig = original local filename before merge orig = original local filename before merge
fco = other file context fco = other file context

tests/test-merge-tools.t

arg: "ll:working copy" arg: "ll:working copy"
arg: "lo:" arg: "lo:"
arg: "merge rev" arg: "merge rev"
arg: "lb:base: */f~base.*" (glob) arg: "lb:base: */f~base.*" (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool' $ rm -f 'printargs_merge_tool'
Same test with experimental.mergetempdirprefix set:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ cat <<EOF > printargs_merge_tool
> while test \$# -gt 0; do echo arg: \"\$1\"; shift; done
> EOF
$ hg --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. \
> --config merge-tools.true.executable='sh' \
> --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
> --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
> --config ui.mergemarkertemplate='uitmpl {rev}' \
> --config ui.mergemarkers=detailed \
> merge -r 2
merging f
arg: "ll:working copy"
arg: "lo:"
arg: "merge rev"
arg: "lb:base: $TESTTMP/hgmerge.??????/f~base" (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm -f 'printargs_merge_tool'
Merge using a tool that supports labellocal, labelother, and labelbase, checking Merge using a tool that supports labellocal, labelother, and labelbase, checking
that they're quoted properly as well. This is using 'detailed' mergemarkers, that they're quoted properly as well. This is using 'detailed' mergemarkers,
even though ui.mergemarkers is 'basic', and using the tool's even though ui.mergemarkers is 'basic', and using the tool's
mergemarkertemplate: mergemarkertemplate:
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
$ hg ci -qm "f.txt" $ hg ci -qm "f.txt"
$ hg update -q -C 2 $ hg update -q -C 2
$ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
merging f and f.txt to f.txt merging f and f.txt to f.txt
*/f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
Verify naming of temporary files and that extension is preserved
(experimental.mergetempdirprefix version):
$ hg update -q -C 1
$ hg mv f f.txt
$ hg ci -qm "f.txt"
$ hg update -q -C 2
$ hg merge -y -r tip --tool echo \
> --config merge-tools.echo.args='$base $local $other $output' \
> --config experimental.mergetempdirprefix=$TESTTMP/hgmerge.
merging f and f.txt to f.txt
$TESTTMP/hgmerge.??????/f~base $TESTTMP/f.txt.orig $TESTTMP/hgmerge.??????/f~other.txt $TESTTMP/f.txt (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Check that debugpicktool examines which merge tool is chosen for Check that debugpicktool examines which merge tool is chosen for
specified file as expected specified file as expected
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat