extdiff.py
251 lines
| 9.1 KiB
| text/x-python
|
PythonLexer
/ hgext / extdiff.py
|
r2333 | # extdiff.py - external diff program support for mercurial | ||
# | ||||
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | ||||
# | ||||
# This software may be used and distributed according to the terms | ||||
# of the GNU General Public License, incorporated herein by reference. | ||||
|
r5245 | |||
''' | ||||
The `extdiff' Mercurial extension allows you to use external programs | ||||
to compare revisions, or revision with working dir. The external diff | ||||
programs are called with a configurable set of options and two | ||||
non-option arguments: paths to directories containing snapshots of | ||||
files to compare. | ||||
To enable this extension: | ||||
[extensions] | ||||
hgext.extdiff = | ||||
The `extdiff' extension also allows to configure new diff commands, so | ||||
you do not need to type "hg extdiff -p kdiff3" always. | ||||
|
r3127 | |||
|
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 | ||||
|
r3127 | |||
|
r5245 | # add new command called vdiff, runs kdiff3 | ||
vdiff = kdiff3 | ||||
|
r3127 | |||
|
r5245 | # add new command called meld, runs meld (no need to name twice) | ||
meld = | ||||
# add new command called vimdiff, runs gvimdiff with DirDiff plugin | ||||
#(see http://www.vim.org/scripts/script.php?script_id=102) | ||||
# Non english user, be sure to put "let g:DirDiffDynamicDiffText = 1" in | ||||
# your .vimrc | ||||
vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' | ||||
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). | ||||
''' | ||||
|
r2333 | |||
|
r3891 | from mercurial.i18n import _ | ||
|
r6211 | from mercurial.node import short | ||
|
r5147 | from mercurial import cmdutil, util, commands | ||
|
r5245 | import os, shlex, shutil, tempfile | ||
|
r5135 | |||
def snapshot_node(ui, repo, files, node, tmproot): | ||||
'''snapshot files as of some revision''' | ||||
dirname = os.path.basename(repo.root) | ||||
if dirname == "": | ||||
dirname = "root" | ||||
dirname = '%s.%s' % (dirname, short(node)) | ||||
base = os.path.join(tmproot, dirname) | ||||
os.mkdir(base) | ||||
|
r5136 | ui.note(_('making snapshot of %d files from rev %s\n') % | ||
|
r5143 | (len(files), short(node))) | ||
|
r6747 | ctx = repo[node] | ||
|
r5135 | for fn in files: | ||
|
r6747 | wfn = util.pconvert(fn) | ||
if not wfn in ctx: | ||||
|
r5135 | # skipping new file after a merge ? | ||
continue | ||||
ui.note(' %s\n' % wfn) | ||||
dest = os.path.join(base, wfn) | ||||
destdir = os.path.dirname(dest) | ||||
if not os.path.isdir(destdir): | ||||
os.makedirs(destdir) | ||||
|
r6747 | data = repo.wwritedata(wfn, ctx[wfn].data()) | ||
|
r5135 | open(dest, 'wb').write(data) | ||
return dirname | ||||
def snapshot_wdir(ui, repo, files, tmproot): | ||||
'''snapshot files from working directory. | ||||
if not using snapshot, -I/-X does not work and recursive diff | ||||
in tools like kdiff3 and meld displays too many files.''' | ||||
|
r6103 | repo_root = repo.root | ||
dirname = os.path.basename(repo_root) | ||||
|
r5135 | if dirname == "": | ||
dirname = "root" | ||||
base = os.path.join(tmproot, dirname) | ||||
os.mkdir(base) | ||||
|
r5136 | ui.note(_('making snapshot of %d files from working dir\n') % | ||
|
r5143 | (len(files))) | ||
|
r6103 | |||
fns_and_mtime = [] | ||||
|
r5135 | for fn in files: | ||
wfn = util.pconvert(fn) | ||||
ui.note(' %s\n' % wfn) | ||||
dest = os.path.join(base, wfn) | ||||
destdir = os.path.dirname(dest) | ||||
if not os.path.isdir(destdir): | ||||
os.makedirs(destdir) | ||||
|
r6103 | |||
|
r5135 | fp = open(dest, 'wb') | ||
for chunk in util.filechunkiter(repo.wopener(wfn)): | ||||
fp.write(chunk) | ||||
|
r6103 | fp.close() | ||
fns_and_mtime.append((dest, os.path.join(repo_root, fn), | ||||
os.path.getmtime(dest))) | ||||
return dirname, fns_and_mtime | ||||
|
r5143 | |||
|
r2333 | |||
|
r2906 | def dodiff(ui, repo, diffcmd, diffopts, pats, opts): | ||
|
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 | ||||
''' | ||||
|
r3707 | node1, node2 = cmdutil.revpair(repo, opts['rev']) | ||
|
r6582 | matcher = cmdutil.match(repo, pats, opts) | ||
|
r2875 | modified, added, removed, deleted, unknown = repo.status( | ||
|
r6603 | node1, node2, matcher)[:5] | ||
|
r2333 | if not (modified or added or removed): | ||
return 0 | ||||
tmproot = tempfile.mkdtemp(prefix='extdiff.') | ||||
|
r5137 | dir2root = '' | ||
|
r2333 | try: | ||
|
r5137 | # Always make a copy of node1 | ||
|
r5135 | dir1 = snapshot_node(ui, repo, modified + removed, node1, tmproot) | ||
|
r5137 | changes = len(modified) + len(removed) + len(added) | ||
|
r6103 | fns_and_mtime = [] | ||
|
r5137 | # If node2 in not the wc or there is >1 change, copy it | ||
|
r2333 | if node2: | ||
|
r5135 | dir2 = snapshot_node(ui, repo, modified + added, node2, tmproot) | ||
|
r5137 | elif changes > 1: | ||
|
r6103 | #we only actually need to get the files to copy back to the working | ||
#dir in this case (because the other cases are: diffing 2 revisions | ||||
#or single file -- in which case the file is already directly passed | ||||
#to the diff tool). | ||||
dir2, fns_and_mtime = snapshot_wdir(ui, repo, modified + added, tmproot) | ||||
|
r2333 | else: | ||
|
r5137 | # This lets the diff tool open the changed file directly | ||
dir2 = '' | ||||
dir2root = repo.root | ||||
# 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])) | ||||
|
r5143 | dir2 = os.path.join(dir2root, dir2, util.localpath(modified[0])) | ||
|
r5137 | elif len(removed) : | ||
dir1 = os.path.join(dir1, util.localpath(removed[0])) | ||||
dir2 = os.devnull | ||||
else: | ||||
dir1 = os.devnull | ||||
|
r5143 | dir2 = os.path.join(dir2root, dir2, util.localpath(added[0])) | ||
|
r2906 | cmdline = ('%s %s %s %s' % | ||
|
r3074 | (util.shellquote(diffcmd), ' '.join(diffopts), | ||
|
r2906 | util.shellquote(dir1), util.shellquote(dir2))) | ||
ui.debug('running %r in %s\n' % (cmdline, tmproot)) | ||||
util.system(cmdline, cwd=tmproot) | ||||
|
r6103 | |||
for copy_fn, working_fn, mtime in fns_and_mtime: | ||||
if os.path.getmtime(copy_fn) != mtime: | ||||
ui.debug('File changed while diffing. ' | ||||
'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) | ||||
util.copyfile(copy_fn, working_fn) | ||||
|
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 | ||||
|
r2906 | an external program. The default program used is diff, with | ||
default options "-Npru". | ||||
|
r2333 | To select a different program, use the -p option. The program | ||
will be passed the names of two directories to compare. To pass | ||||
additional options to the program, use the -o option. These will | ||||
be passed before the names of the directories to compare. | ||||
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.''' | ||||
|
r3129 | program = opts['program'] or 'diff' | ||
if opts['program']: | ||||
option = opts['option'] | ||||
else: | ||||
option = opts['option'] or ['-Npru'] | ||||
return dodiff(ui, repo, program, option, pats, opts) | ||||
|
r2333 | |||
cmdtable = { | ||||
"extdiff": | ||||
(extdiff, | ||||
[('p', 'program', '', _('comparison program to run')), | ||||
('o', 'option', [], _('pass option to comparison program')), | ||||
('r', 'rev', [], _('revision')), | ||||
|
r5147 | ] + commands.walkopts, | ||
|
r2333 | _('hg extdiff [OPT]... [FILE]...')), | ||
} | ||||
def uisetup(ui): | ||||
for cmd, path in ui.configitems('extdiff'): | ||||
|
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, [] | ||||
|
r2959 | def save(cmd, path, diffopts): | ||
|
r2333 | '''use closure to save diff command to use''' | ||
def mydiff(ui, repo, *pats, **opts): | ||||
|
r2906 | return dodiff(ui, repo, path, diffopts, pats, opts) | ||
|
r5291 | mydiff.__doc__ = '''use %(path)s to diff repository (or selected files) | ||
|
r2333 | |||
Show differences between revisions for the specified | ||||
|
r5291 | files, using the %(path)s 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 | ||||
|
r2906 | working directory files are compared to its parent.''' % { | ||
|
r5291 | 'path': util.uirepr(path), | ||
|
r2906 | } | ||
|
r2333 | return mydiff | ||
|
r2959 | cmdtable[cmd] = (save(cmd, path, diffopts), | ||
|
r2333 | cmdtable['extdiff'][1][1:], | ||
|
r4730 | _('hg %s [OPTION]... [FILE]...') % cmd) | ||