Mercurial > hg-stable
changeset 24728:75688a6f0bca
branchcache: stay silent if failing to read cache files
The warning has in some cases incorrectly attributed unrelated problems to rbc.
Instead, just do like the branch head cache does and stay quiet when reading
fails. The cache will be missing the first time a repo is used. It is a normal
situation and there is no reason to make a note of that.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 14 Jan 2015 01:15:26 +0100 |
| parents | 5668202cfaaf |
| children | 3e48462ec15a |
| files | mercurial/branchmap.py tests/test-casefolding.t tests/test-convert-svn-encoding.t |
| diffstat | 3 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/branchmap.py Thu Mar 19 22:22:50 2015 +0100 +++ b/mercurial/branchmap.py Wed Jan 14 01:15:26 2015 +0100 @@ -316,8 +316,6 @@ self._rbcsnameslen = len(bndata) # for verification before writing self._names = [encoding.tolocal(bn) for bn in bndata.split('\0')] except (IOError, OSError), inst: - repo.ui.debug("couldn't read revision branch cache names: %s\n" % - inst) if readonly: # don't try to use cache - fall back to the slow path self.branchinfo = self._branchinfo
--- a/tests/test-casefolding.t Thu Mar 19 22:22:50 2015 +0100 +++ b/tests/test-casefolding.t Wed Jan 14 01:15:26 2015 +0100 @@ -28,7 +28,6 @@ a committing manifest committing changelog - couldn't read revision branch cache names: * (glob) committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 Case-changing renames should work:
--- a/tests/test-convert-svn-encoding.t Thu Mar 19 22:22:50 2015 +0100 +++ b/tests/test-convert-svn-encoding.t Wed Jan 14 01:15:26 2015 +0100 @@ -53,7 +53,6 @@ source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 converting: 0/6 revisions (0.00%) committing changelog - couldn't read revision branch cache names: * (glob) 4 hello source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 converting: 1/6 revisions (16.67%)