comparison hgext/extdiff.py @ 5293:32ec518ee3cb

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Mon, 10 Sep 2007 23:53:23 +0200
parents a1efa71f3ece 23651848d638
children
comparison
equal deleted inserted replaced
5290:05889b6b1468 5293:32ec518ee3cb
199 path, diffopts = cmd, [] 199 path, diffopts = cmd, []
200 def save(cmd, path, diffopts): 200 def save(cmd, path, diffopts):
201 '''use closure to save diff command to use''' 201 '''use closure to save diff command to use'''
202 def mydiff(ui, repo, *pats, **opts): 202 def mydiff(ui, repo, *pats, **opts):
203 return dodiff(ui, repo, path, diffopts, pats, opts) 203 return dodiff(ui, repo, path, diffopts, pats, opts)
204 mydiff.__doc__ = '''use %(path)r to diff repository (or selected files) 204 mydiff.__doc__ = '''use %(path)s to diff repository (or selected files)
205 205
206 Show differences between revisions for the specified 206 Show differences between revisions for the specified
207 files, using the %(path)r program. 207 files, using the %(path)s program.
208 208
209 When two revision arguments are given, then changes are 209 When two revision arguments are given, then changes are
210 shown between those revisions. If only one revision is 210 shown between those revisions. If only one revision is
211 specified then that revision is compared to the working 211 specified then that revision is compared to the working
212 directory, and, when no revisions are specified, the 212 directory, and, when no revisions are specified, the
213 working directory files are compared to its parent.''' % { 213 working directory files are compared to its parent.''' % {
214 'path': path, 214 'path': util.uirepr(path),
215 } 215 }
216 return mydiff 216 return mydiff
217 cmdtable[cmd] = (save(cmd, path, diffopts), 217 cmdtable[cmd] = (save(cmd, path, diffopts),
218 cmdtable['extdiff'][1][1:], 218 cmdtable['extdiff'][1][1:],
219 _('hg %s [OPTION]... [FILE]...') % cmd) 219 _('hg %s [OPTION]... [FILE]...') % cmd)