Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6548:962eb403165b | 6549:2af1b9de62b3 |
|---|---|
| 243 # check renames | 243 # check renames |
| 244 try: | 244 try: |
| 245 rp = fl.renamed(n) | 245 rp = fl.renamed(n) |
| 246 if rp: | 246 if rp: |
| 247 fl2 = repo.file(rp[0]) | 247 fl2 = repo.file(rp[0]) |
| 248 rev = fl2.rev(rp[1]) | 248 if fl2.count() == 0: |
| 249 err(flr, _("empty or missing copy source revlog %s:%s") | |
| 250 % (rp[0], short(rp[1])), f) | |
| 251 elif rp[1] == nullid: | |
| 252 err(flr, _("copy source revision is nullid %s:%s") | |
| 253 % (rp[0], short(rp[1])), f) | |
| 254 else: | |
| 255 rev = fl2.rev(rp[1]) | |
| 249 except KeyboardInterrupt: | 256 except KeyboardInterrupt: |
| 250 repo.ui.warn(_("interrupted")) | 257 repo.ui.warn(_("interrupted")) |
| 251 raise | 258 raise |
| 252 except Exception, inst: | 259 except Exception, inst: |
| 253 err(flr, _("checking rename of %s: %s") % | 260 err(flr, _("checking rename of %s: %s") % |