Mercurial > hg

changeset 5291:23651848d638

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: avoid repr() doubling paths backslashes under Windows
author Patrick Mezard <pmezard@gmail.com>
date Mon, 10 Sep 2007 23:36:01 +0200
parents ed6df6b1c29a
children 5a65d870871d
files hgext/extdiff.py mercurial/util.py
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/extdiff.py	Fri Sep 07 17:38:52 2007 +0200
+++ b/hgext/extdiff.py	Mon Sep 10 23:36:01 2007 +0200
@@ -174,17 +174,17 @@
             '''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),
--- a/mercurial/util.py	Fri Sep 07 17:38:52 2007 +0200
+++ b/mercurial/util.py	Mon Sep 10 23:36:01 2007 +0200
@@ -1628,3 +1628,7 @@
         if path.startswith('//'):
             path = path[2:]
     return path
+
+def uirepr(s):
+    # Avoid double backslash in Windows path repr()
+    return repr(s).replace('\\\\', '\\')