Mercurial > hg
changeset 3756:2f2b59fcb394
merge with crew
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 01 Dec 2006 23:28:14 +0100 |
| parents | 05120e210c65 (diff) 5342d5ae565d (current diff) |
| children | faed44bab17b |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/revlog.py Fri Dec 01 13:54:47 2006 -0800 +++ b/mercurial/revlog.py Fri Dec 01 23:28:14 2006 +0100 @@ -81,7 +81,7 @@ # 32 bytes: nodeid indexformatng = ">Qiiiiii20s12x" ngshaoffset = 32 -versionformat = ">i" +versionformat = ">I" class lazyparser(object): """ @@ -355,12 +355,12 @@ fmt = v & 0xFFFF if fmt == REVLOGV0: if flags: - raise RevlogError(_("index %s unknown flags %x for format v0") - % (self.indexfile, flags)) + raise RevlogError(_("index %s unknown flags %#04x for format v0") + % (self.indexfile, flags >> 16)) elif fmt == REVLOGNG: if flags & ~REVLOGNGINLINEDATA: - raise RevlogError(_("index %s unknown flags %x for revlogng") - % (self.indexfile, flags)) + raise RevlogError(_("index %s unknown flags %#04x for revlogng") + % (self.indexfile, flags >> 16)) else: raise RevlogError(_("index %s unknown format %d") % (self.indexfile, fmt))