Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/revlog.py @ 3754:cd25a4a1a265
Improve error message for unknown revlog flags.
Old: unknown flags 120000 for ...
New: unknown flags 0x0012 for ...
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Dec 2006 23:16:12 +0100 |
parents | 3a099154b110 |
children | 05120e210c65 |
comparison
equal
deleted
inserted
replaced
3751:797c6e70092b | 3754:cd25a4a1a265 |
---|---|
353 v = struct.unpack(versionformat, i)[0] | 353 v = struct.unpack(versionformat, i)[0] |
354 flags = v & ~0xFFFF | 354 flags = v & ~0xFFFF |
355 fmt = v & 0xFFFF | 355 fmt = v & 0xFFFF |
356 if fmt == REVLOGV0: | 356 if fmt == REVLOGV0: |
357 if flags: | 357 if flags: |
358 raise RevlogError(_("index %s unknown flags %x for format v0") | 358 raise RevlogError(_("index %s unknown flags %#04x for format v0") |
359 % (self.indexfile, flags)) | 359 % (self.indexfile, flags >> 16)) |
360 elif fmt == REVLOGNG: | 360 elif fmt == REVLOGNG: |
361 if flags & ~REVLOGNGINLINEDATA: | 361 if flags & ~REVLOGNGINLINEDATA: |
362 raise RevlogError(_("index %s unknown flags %x for revlogng") | 362 raise RevlogError(_("index %s unknown flags %#04x for revlogng") |
363 % (self.indexfile, flags)) | 363 % (self.indexfile, flags >> 16)) |
364 else: | 364 else: |
365 raise RevlogError(_("index %s unknown format %d") | 365 raise RevlogError(_("index %s unknown format %d") |
366 % (self.indexfile, fmt)) | 366 % (self.indexfile, fmt)) |
367 self.version = v | 367 self.version = v |
368 if v == REVLOGV0: | 368 if v == REVLOGV0: |