changeset 3746:a095c13c173c

merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 13:11:09 +0100
parents 68cddfbbe737 (current diff) d626fc9e3985 (diff)
children b5c4d749f37f
files
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revlog.py	Fri Dec 01 09:42:07 2006 +0100
+++ b/mercurial/revlog.py	Fri Dec 01 13:11:09 2006 +0100
@@ -355,14 +355,14 @@
         fmt = v & 0xFFFF
         if fmt == REVLOGV0:
             if flags:
-                raise RevlogError(_("index %s invalid flags %x for format v0")
+                raise RevlogError(_("index %s unknown flags %x for format v0")
                                   % (self.indexfile, flags))
         elif fmt == REVLOGNG:
             if flags & ~REVLOGNGINLINEDATA:
-                raise RevlogError(_("index %s invalid flags %x for revlogng")
+                raise RevlogError(_("index %s unknown flags %x for revlogng")
                                   % (self.indexfile, flags))
         else:
-            raise RevlogError(_("index %s invalid format %d")
+            raise RevlogError(_("index %s unknown format %d")
                               % (self.indexfile, fmt))
         self.version = v
         if v == REVLOGV0:
--- a/mercurial/verify.py	Fri Dec 01 09:42:07 2006 +0100
+++ b/mercurial/verify.py	Fri Dec 01 13:11:09 2006 +0100
@@ -179,6 +179,18 @@
                         (f, short(n), short(p1)))
             nodes[n] = 1
 
+            # check renames
+            try:
+                rp = fl.renamed(n)
+                if rp:
+                    fl2 = repo.file(rp[0])
+                    rev = fl2.rev(rp[1])
+            except KeyboardInterrupt:
+                repo.ui.warn(_("interrupted"))
+                raise
+            except Exception, inst:
+                err(_("checking rename on file %s %s: %s") % (f, short(n), inst))
+
         # cross-check
         for node in filenodes[f]:
             err(_("node %s in manifests not in %s") % (hex(node), f))