Mercurial > hg-stable

changeset 9050:77324df822e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: fix indentation and use gettext
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 23:30:48 +0200
parents 38b5d5e0efab
children f8e25885d975
files hgext/extdiff.py tests/test-extdiff.out
diffstat 2 files changed, 15 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/extdiff.py	Tue Jul 07 17:26:20 2009 +0200
+++ b/hgext/extdiff.py	Tue Jul 07 23:30:48 2009 +0200
@@ -211,18 +211,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)s 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)s program.
+    Show differences between revisions for the specified 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': util.uirepr(path),
-                }
+    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.\
+''') % dict(path=util.uirepr(path))
             return mydiff
         cmdtable[cmd] = (save(cmd, path, diffopts),
                          cmdtable['extdiff'][1][1:],
--- a/tests/test-extdiff.out	Tue Jul 07 17:26:20 2009 +0200
+++ b/tests/test-extdiff.out	Tue Jul 07 23:30:48 2009 +0200
@@ -7,14 +7,13 @@
 
 use 'echo' to diff repository (or selected files)
 
-            Show differences between revisions for the specified
-            files, using the 'echo' program.
+    Show differences between revisions for the specified files, using the
+    'echo' 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.
+    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.
 
 options: