--- a/mercurial/branchmap.py Mon Dec 31 17:46:22 2012 -0600
+++ b/mercurial/branchmap.py Fri Dec 28 00:13:32 2012 +0100
@@ -22,21 +22,20 @@
partial = branchcache(tipnode=last, tiprev=lrev)
if not partial.validfor(repo):
# invalidate the cache
- raise ValueError('invalidating branch cache (tip differs)')
+ raise ValueError('tip differs')
for l in lines:
if not l:
continue
node, label = l.split(" ", 1)
label = encoding.tolocal(label.strip())
if not node in repo:
- raise ValueError('invalidating branch cache because node '+
- '%s does not exist' % node)
+ raise ValueError('node %s does not exist' % node)
partial.setdefault(label, []).append(bin(node))
except KeyboardInterrupt:
raise
except Exception, inst:
if repo.ui.debugflag:
- repo.ui.warn(str(inst), '\n')
+ repo.ui.warn(('invalid branchheads cache: %s\n') % inst)
partial = branchcache()
return partial