extdiff: avoid repr() doubling paths backslashes under Windows

This commit is contained in:
Patrick Mezard 2007-09-10 23:36:01 +02:00
parent a80e1eb528
commit 239ea63571
2 changed files with 7 additions and 3 deletions

View File

@ -174,17 +174,17 @@ def uisetup(ui):
'''use closure to save diff command to use'''
def mydiff(ui, repo, *pats, **opts):
return dodiff(ui, repo, path, diffopts, pats, opts)
mydiff.__doc__ = '''use %(path)r to diff repository (or selected files)
mydiff.__doc__ = '''use %(path)s to diff repository (or selected files)
Show differences between revisions for the specified
files, using the %(path)r program.
files, using the %(path)s program.
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.''' % {
'path': path,
'path': util.uirepr(path),
}
return mydiff
cmdtable[cmd] = (save(cmd, path, diffopts),

View File

@ -1628,3 +1628,7 @@ def drop_scheme(scheme, path):
if path.startswith('//'):
path = path[2:]
return path
def uirepr(s):
# Avoid double backslash in Windows path repr()
return repr(s).replace('\\\\', '\\')