Mercurial > hg

changeset 554:2f515dcfbc24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some linewrapping -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix some linewrapping manifest hash: 3be515e65adeb9652e646059fb6dc8d23b0a7a72 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxP0dywK+sNU5EO8RAoSCAJ9kOtNnkesCD/QplxujNJxvb8JJowCeJb0Q q58TYLTbZ8wnuFwagBABVds= =CN45 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 00:21:49 -0800
parents f2442a6a5893
children 39a1cfb03ebd
files mercurial/commands.py
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jul 01 00:10:52 2005 -0800
+++ b/mercurial/commands.py	Fri Jul 01 00:21:49 2005 -0800
@@ -29,7 +29,8 @@
 def relpath(repo, args):
     if os.getcwd() != repo.root:
         p = os.getcwd()[len(repo.root) + 1: ]
-        return [ util.pconvert(os.path.normpath(os.path.join(p, x))) for x in args ]
+        return [ util.pconvert(os.path.normpath(os.path.join(p, x)))
+                 for x in args ]
     return args
 
 def dodiff(ui, repo, files = None, node1 = None, node2 = None):
@@ -362,7 +363,8 @@
             print "%s in state %s, but also listed in manifest1" % (f, state)
             errors += 1
         if state in "m" and f not in m1 and f not in m2:
-            print "%s in state %s, but not listed in either manifest" % (f, state)
+            print "%s in state %s, but not listed in either manifest" % \
+                  (f, state)
             errors += 1
     for f in m1:
         state = repo.dirstate.state(f)
@@ -370,7 +372,7 @@
             print "%s in manifest1, but listed as state %s" % (f, state)
             errors += 1
     if errors:
-        print ".hg/dirstate inconsistent with current parent's manifest, aborting"
+        print ".hg/dirstate inconsistent with current parent's manifest"
         sys.exit(1)
 
 def debugdumpdirstate(ui, repo):