equal
deleted
inserted
replaced
429 ui.warn("changeset %s has unknown parent %s\n" % |
429 ui.warn("changeset %s has unknown parent %s\n" % |
430 (hg.short(n), hg.short(p))) |
430 (hg.short(n), hg.short(p))) |
431 errors += 1 |
431 errors += 1 |
432 try: |
432 try: |
433 changes = repo.changelog.read(n) |
433 changes = repo.changelog.read(n) |
434 except Error, inst: |
434 except Exception, inst: |
435 ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) |
435 ui.warn("unpacking changeset %s: %s\n" % (short(n), inst)) |
436 errors += 1 |
436 errors += 1 |
437 |
437 |
438 manifestchangeset[changes[0]] = n |
438 manifestchangeset[changes[0]] = n |
439 for f in changes[3]: |
439 for f in changes[3]: |
506 filelinkrevs[f].remove(flr) |
506 filelinkrevs[f].remove(flr) |
507 |
507 |
508 # verify contents |
508 # verify contents |
509 try: |
509 try: |
510 t = fl.read(n) |
510 t = fl.read(n) |
511 except Error, inst: |
511 except Exception, inst: |
512 ui.warn("unpacking file %s %s: %s\n" % (f, short(n), inst)) |
512 ui.warn("unpacking file %s %s: %s\n" % (f, hg.short(n), inst)) |
513 errors += 1 |
513 errors += 1 |
514 |
514 |
515 # verify parents |
515 # verify parents |
516 (p1, p2) = fl.parents(n) |
516 (p1, p2) = fl.parents(n) |
517 if p1 not in nodes: |
517 if p1 not in nodes: |