##// END OF EJS Templates
really treat the right side of acl.{allow,deny} as a list of users...
really treat the right side of acl.{allow,deny} as a list of users the current implementation seems to expect only user per pattern, which contradicts the documentation available at the file beginning.

File last commit:

r2959:7f5fc4b3 default
r3062:5e39ad2c default
Show More
extdiff.py
175 lines | 7.3 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>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
#
Giorgos Keramidas
Tune a bit the extdiff toplevel comments/samples....
r2913 # 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.
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 #
Giorgos Keramidas
Tune a bit the extdiff toplevel comments/samples....
r2913 # To enable this extension:
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 #
# [extensions]
# hgext.extdiff =
#
Giorgos Keramidas
Tune a bit the extdiff toplevel comments/samples....
r2913 # The `extdiff' extension also allows to configure new diff commands, so
# you do not need to type "hg extdiff -p kdiff3" always.
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 #
# [extdiff]
Giorgos Keramidas
Tune a bit the extdiff toplevel comments/samples....
r2913 # # add new command that runs GNU diff(1) in 'context diff' mode
# cmd.cdiff = gdiff
# opts.cdiff = -Nprc5
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 # # add new command called vdiff, runs kdiff3
# cmd.vdiff = kdiff3
# # add new command called meld, runs meld (no need to name twice)
# cmd.meld =
"Mathieu Clabaut "
extdiff : add comment on how to use vim for doing directoy diff
r2675 # # add new command called vimdiff, runs gvimdiff with DirDiff plugin
# #(see http://www.vim.org/scripts/script.php?script_id=102)
# cmd.vimdiff = LC_ALL=C gvim -f '+bdel 1 2' '+ execute "DirDiff ".argv(0)." ".argv(1)'
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 #
Giorgos Keramidas
Tune a bit the extdiff toplevel comments/samples....
r2913 # Each custom diff commands can have two parts: a `cmd' and an `opts'
# part. The cmd.xxx option defines the name of an executable program
# that will be run, and opts.xxx defines a set of command-line options
# which will be inserted to the command between the program name and
# the files/directories to diff (i.e. the cdiff example above).
#
# 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).
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
from mercurial.demandload import demandload
from mercurial.i18n import gettext as _
from mercurial.node import *
Brendan Cully
Update extdiff for recent refactoring
r2902 demandload(globals(), 'mercurial:commands,cmdutil,util os shutil tempfile')
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
r2333 def snapshot_node(files, node):
'''snapshot files as of some revision'''
changes = repo.changelog.read(node)
mf = repo.manifest.read(changes[0])
dirname = '%s.%s' % (os.path.basename(repo.root), short(node))
base = os.path.join(tmproot, dirname)
os.mkdir(base)
if not ui.quiet:
ui.write_err(_('making snapshot of %d files from rev %s\n') %
(len(files), short(node)))
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)
repo.wwrite(wfn, repo.file(fn).read(mf[fn]), open(dest, 'w'))
return dirname
def snapshot_wdir(files):
'''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.'''
dirname = os.path.basename(repo.root)
base = os.path.join(tmproot, dirname)
os.mkdir(base)
if not ui.quiet:
ui.write_err(_('making snapshot of %d files from working dir\n') %
(len(files)))
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)
fp = open(dest, 'w')
for chunk in util.filechunkiter(repo.wopener(wfn)):
fp.write(chunk)
return dirname
node1, node2 = commands.revpair(ui, repo, opts['rev'])
Brendan Cully
Update extdiff for recent refactoring
r2902 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
Vadim Gelfer
remove localrepository.changes....
r2875 modified, added, removed, deleted, unknown = repo.status(
node1, node2, files, match=matchfn)[:5]
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.')
try:
dir1 = snapshot_node(modified + removed, node1)
if node2:
dir2 = snapshot_node(modified + added, node2)
else:
dir2 = snapshot_wdir(modified + added)
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 cmdline = ('%s %s %s %s' %
(util.shellquote(diffcmd),
' '.join(map(util.shellquote, diffopts)),
util.shellquote(dir1), util.shellquote(dir2)))
ui.debug('running %r in %s\n' % (cmdline, tmproot))
util.system(cmdline, cwd=tmproot)
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
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 an external program. The default program used is diff, with
default options "-Npru".
Vadim Gelfer
new extension: extdiff. allows to use external diff program.
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.'''
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 return dodiff(ui, repo, opts['program'] or 'diff',
opts['option'] or ['-Npru'], 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')),
('I', 'include', [], _('include names matching the given patterns')),
('X', 'exclude', [], _('exclude names matching the given patterns'))],
_('hg extdiff [OPT]... [FILE]...')),
}
def uisetup(ui):
for cmd, path in ui.configitems('extdiff'):
if not cmd.startswith('cmd.'): continue
cmd = cmd[4:]
if not path: path = cmd
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 diffopts = ui.config('extdiff', 'opts.' + cmd, '')
diffopts = diffopts and [diffopts] or []
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)
mydiff.__doc__ = '''use %(path)r 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
Vadim Gelfer
extdiff: fix bugs. add test.
r2906 files, using the %(path)r 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.''' % {
'path': path,
}
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:],
_('hg %s [OPT]... [FILE]...') % cmd)