Mercurial > hg
diff mercurial/verify.py @ 6549:2af1b9de62b3
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 23:04:34 +0200 |
parents | 9b35a9f34675 |
children | fb42030d79d6 |
line wrap: on
line diff
--- a/mercurial/verify.py Mon Apr 14 14:34:38 2008 +0200 +++ b/mercurial/verify.py Mon Apr 14 23:04:34 2008 +0200 @@ -245,7 +245,14 @@ rp = fl.renamed(n) if rp: fl2 = repo.file(rp[0]) - rev = fl2.rev(rp[1]) + if fl2.count() == 0: + err(flr, _("empty or missing copy source revlog %s:%s") + % (rp[0], short(rp[1])), f) + elif rp[1] == nullid: + err(flr, _("copy source revision is nullid %s:%s") + % (rp[0], short(rp[1])), f) + else: + rev = fl2.rev(rp[1]) except KeyboardInterrupt: repo.ui.warn(_("interrupted")) raise