##// END OF EJS Templates
extdiff: fix defaulting to "diff" if no --program is given
extdiff: fix defaulting to "diff" if no --program is given

File last commit:

r9519:0d3c1aa9 default
r9519:0d3c1aa9 default
Show More
extdiff.py
229 lines | 8.6 KiB | text/x-python | PythonLexer
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 # extdiff.py - external diff program support for mercurial
#
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
Brendan Cully
Improve extdiff configuration....
r5245
Dirkjan Ochtman
extensions: change descriptions for extensions providing a few commands
r8934 '''command to allow external programs to compare revisions
Dirkjan Ochtman
help: add/fix docstrings for a bunch of extensions
r8873
Brendan Cully
Improve extdiff configuration....
r5245 The `extdiff' Mercurial extension allows you to use external programs
Martin Geisler
expand "dir" to "directory" in help texts
r8026 to compare revisions, or revision with working directory. The external diff
Brendan Cully
Improve extdiff configuration....
r5245 programs are called with a configurable set of options and two
non-option arguments: paths to directories containing snapshots of
files to compare.
The `extdiff' extension also allows to configure new diff commands, so
you do not need to type "hg extdiff -p kdiff3" always.
Mathieu Clabaut
Update [extdiff] configuration sample for vimdiff,...
r3127
Brendan Cully
Improve extdiff configuration....
r5245 [extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode
cdiff = gdiff -Nprc5
## or the old way:
#cmd.cdiff = gdiff
#opts.cdiff = -Nprc5
Mathieu Clabaut
Update [extdiff] configuration sample for vimdiff,...
r3127
Brendan Cully
Improve extdiff configuration....
r5245 # add new command called vdiff, runs kdiff3
vdiff = kdiff3
Mathieu Clabaut
Update [extdiff] configuration sample for vimdiff,...
r3127
Brendan Cully
Improve extdiff configuration....
r5245 # add new command called meld, runs meld (no need to name twice)
meld =
# add new command called vimdiff, runs gvimdiff with DirDiff plugin
Martin Geisler
extdiff: word-wrap help texts at 70 characters
r7990 # (see http://www.vim.org/scripts/script.php?script_id=102)
Martin Geisler
fixed typos found in translatable strings...
r8668 # Non English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
Brendan Cully
Improve extdiff configuration....
r5245 # your .vimrc
vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
Martin Geisler
extdiff: word-wrap help texts at 70 characters
r7990 You can use -I/-X and list of file or directory names like normal "hg
diff" command. The `extdiff' extension makes snapshots of only needed
files, so running the external diff program will actually be pretty
fast (at least faster than having to compare the entire tree).
Brendan Cully
Improve extdiff configuration....
r5245 '''
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
Matt Mackall
Simplify i18n imports
r3891 from mercurial.i18n import _
Joel Rosdahl
Expand import * to allow Pyflakes to find problems
r6211 from mercurial.node import short
Benoit Boissinot
refactor options from cmdtable...
r5147 from mercurial import cmdutil, util, commands
Brendan Cully
Improve extdiff configuration....
r5245 import os, shlex, shutil, tempfile
Brad Schick
extdiff: un-nested two functions...
r5135
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 def snapshot(ui, repo, files, node, tmproot):
'''snapshot files as of some revision
if not using snapshot, -I/-X does not work and recursive diff
in tools like kdiff3 and meld displays too many files.'''
Brad Schick
extdiff: un-nested two functions...
r5135 dirname = os.path.basename(repo.root)
if dirname == "":
dirname = "root"
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 if node is not None:
dirname = '%s.%s' % (dirname, short(node))
Brad Schick
extdiff: un-nested two functions...
r5135 base = os.path.join(tmproot, dirname)
os.mkdir(base)
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 if node is not None:
ui.note(_('making snapshot of %d files from rev %s\n') %
(len(files), short(node)))
else:
Patrick Mezard
Merge with crew-stable
r8066 ui.note(_('making snapshot of %d files from working directory\n') %
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 (len(files)))
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
r8065 wopener = util.opener(base)
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 fns_and_mtime = []
Matt Mackall
use repo[changeid] to get a changectx
r6747 ctx = repo[node]
Brad Schick
extdiff: un-nested two functions...
r5135 for fn in files:
Matt Mackall
use repo[changeid] to get a changectx
r6747 wfn = util.pconvert(fn)
if not wfn in ctx:
Brad Schick
extdiff: un-nested two functions...
r5135 # skipping new file after a merge ?
continue
ui.note(' %s\n' % wfn)
dest = os.path.join(base, wfn)
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
r8065 fctx = ctx[wfn]
data = repo.wwritedata(wfn, fctx.data())
if 'l' in fctx.flags():
wopener.symlink(data, wfn)
else:
wopener(wfn, 'w').write(data)
if 'x' in fctx.flags():
util.set_flags(dest, False, True)
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 if node is None:
fns_and_mtime.append((dest, repo.wjoin(fn), os.path.getmtime(dest)))
Fabio Zadrozny <fabiofz at gmail dot com>
Propagating changes back to working dirs when changing files in external
r6103 return dirname, fns_and_mtime
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
Fabio Zadrozny <fabiofz at gmail dot com>
Propagating changes back to working dirs when changing files in external
r6103 '''Do the actuall diff:
- copy to a temp structure if diffing 2 internal revisions
- copy to a temp structure if diffing working revision with
another one and more than 1 file is changed
- just invoke the diff for a single file in the working dir
'''
Gilles Moris
extdiff: add --change option to display single changeset diff...
r7758
revs = opts.get('rev')
change = opts.get('change')
if revs and change:
msg = _('cannot specify --rev and --change at the same time')
raise util.Abort(msg)
elif change:
node2 = repo.lookup(change)
node1 = repo[node2].parents()[0].node()
else:
node1, node2 = cmdutil.revpair(repo, revs)
Matt Mackall
walk: remove remaining users of cmdutils.matchpats
r6582 matcher = cmdutil.match(repo, pats, opts)
Matt Mackall
status: clean up all users for unknown files
r6760 modified, added, removed = repo.status(node1, node2, matcher)[:3]
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 if not (modified or added or removed):
return 0
tmproot = tempfile.mkdtemp(prefix='extdiff.')
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 dir2root = ''
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 try:
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 # Always make a copy of node1
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 dir1 = snapshot(ui, repo, modified + removed, node1, tmproot)[0]
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 changes = len(modified) + len(removed) + len(added)
# If node2 in not the wc or there is >1 change, copy it
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 if node2 or changes > 1:
dir2, fns_and_mtime = snapshot(ui, repo, modified + added, node2, tmproot)
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 else:
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 # This lets the diff tool open the changed file directly
dir2 = ''
dir2root = repo.root
Patrick Mezard
extdiff: merge node and working dir snapshot modes
r8064 fns_and_mtime = []
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137
# If only one change, diff the files instead of the directories
if changes == 1 :
if len(modified):
dir1 = os.path.join(dir1, util.localpath(modified[0]))
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 dir2 = os.path.join(dir2root, dir2, util.localpath(modified[0]))
Brad Schick
extdiff: do single file diffs from the wc with no copy...
r5137 elif len(removed) :
dir1 = os.path.join(dir1, util.localpath(removed[0]))
dir2 = os.devnull
else:
dir1 = os.devnull
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 dir2 = os.path.join(dir2root, dir2, util.localpath(added[0]))
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 cmdline = ('%s %s %s %s' %
TK Soh
extdiff: do not shell-quote options to new commands...
r3074 (util.shellquote(diffcmd), ' '.join(diffopts),
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 util.shellquote(dir1), util.shellquote(dir2)))
Martin Geisler
i18n: mark strings for translation in extdiff extension
r6957 ui.debug(_('running %r in %s\n') % (cmdline, tmproot))
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 util.system(cmdline, cwd=tmproot)
Fabio Zadrozny <fabiofz at gmail dot com>
Propagating changes back to working dirs when changing files in external
r6103
for copy_fn, working_fn, mtime in fns_and_mtime:
if os.path.getmtime(copy_fn) != mtime:
Martin Geisler
lowercase ui.debug and assert output...
r7599 ui.debug(_('file changed while diffing. '
Martin Geisler
i18n: mark strings for translation in extdiff extension
r6957 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn))
Fabio Zadrozny <fabiofz at gmail dot com>
Propagating changes back to working dirs when changing files in external
r6103 util.copyfile(copy_fn, working_fn)
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 return 1
finally:
ui.note(_('cleaning up temp directory\n'))
shutil.rmtree(tmproot)
def extdiff(ui, repo, *pats, **opts):
'''use external program to diff repository (or selected files)
Show differences between revisions for the specified files, using
Martin Geisler
Change double spaces to single spaces in help texts.
r7983 an external program. The default program used is diff, with
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 default options "-Npru".
Martin Geisler
help texts: write command line switches as -a/--abc
r8076 To select a different program, use the -p/--program option. The
program will be passed the names of two directories to compare. To
pass additional options to the program, use -o/--option. These
will be passed before the names of the directories to compare.
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
Martin Geisler
extdiff: word-wrap help texts at 70 characters
r7990 When two revision arguments are given, then changes are shown
between those revisions. If only one revision is specified then
that revision is compared to the working directory, and, when no
revisions are specified, the working directory files are compared
to its parent.'''
Peter Arrenbrecht
extdiff: fix defaulting to "diff" if no --program is given
r9519 program = opts.get('program')
option = opts.get('option')
if not program:
program = 'diff'
option = option or ['-Npru']
TK Soh
extdiff: use the default option only if the default program is used
r3129 return dodiff(ui, repo, program, option, pats, opts)
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
cmdtable = {
"extdiff":
(extdiff,
[('p', 'program', '', _('comparison program to run')),
('o', 'option', [], _('pass option to comparison program')),
('r', 'rev', [], _('revision')),
Gilles Moris
extdiff: add --change option to display single changeset diff...
r7758 ('c', 'change', '', _('change made by revision')),
Benoit Boissinot
refactor options from cmdtable...
r5147 ] + commands.walkopts,
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 _('hg extdiff [OPT]... [FILE]...')),
}
def uisetup(ui):
for cmd, path in ui.configitems('extdiff'):
Brendan Cully
Improve extdiff configuration....
r5245 if cmd.startswith('cmd.'):
cmd = cmd[4:]
if not path: path = cmd
diffopts = ui.config('extdiff', 'opts.' + cmd, '')
diffopts = diffopts and [diffopts] or []
elif cmd.startswith('opts.'):
continue
else:
# command = path opts
if path:
diffopts = shlex.split(path)
path = diffopts.pop(0)
else:
path, diffopts = cmd, []
TK Soh
extdiff: make new diff commands pick up their options correctly
r2959 def save(cmd, path, diffopts):
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 '''use closure to save diff command to use'''
def mydiff(ui, repo, *pats, **opts):
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 return dodiff(ui, repo, path, diffopts, pats, opts)
Patrick Mezard
extdiff: avoid repr() doubling paths backslashes under Windows
r5291 mydiff.__doc__ = '''use %(path)s to diff repository (or selected files)
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
Show differences between revisions for the specified
Patrick Mezard
extdiff: avoid repr() doubling paths backslashes under Windows
r5291 files, using the %(path)s program.
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
When two revision arguments are given, then changes are
shown between those revisions. If only one revision is
specified then that revision is compared to the working
directory, and, when no revisions are specified, the
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 working directory files are compared to its parent.''' % {
Patrick Mezard
extdiff: avoid repr() doubling paths backslashes under Windows
r5291 'path': util.uirepr(path),
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 }
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 return mydiff
TK Soh
extdiff: make new diff commands pick up their options correctly
r2959 cmdtable[cmd] = (save(cmd, path, diffopts),
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 cmdtable['extdiff'][1][1:],
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
r4730 _('hg %s [OPTION]... [FILE]...') % cmd)