# HG changeset patch # User Matt Mackall # Date 2014-08-14 21:39:02 # Node ID 0cc2db64c3354fe2624f0a95b0cfa70dd48f5e9b # Parent d3702a822241095384d565b2e0b22614f8eeefc7 repoview: fix try/except/finally for py2.4 diff --git a/mercurial/repoview.py b/mercurial/repoview.py --- a/mercurial/repoview.py +++ b/mercurial/repoview.py @@ -85,19 +85,20 @@ def trywritehiddencache(repo, hideable, """ wlock = fh = None try: - wlock = repo.wlock(wait=False) - # write cache to file - newhash = cachehash(repo, hideable) - sortedset = sorted(hidden) - data = struct.pack('>%iI' % len(sortedset), *sortedset) - fh = repo.vfs.open(cachefile, 'w+b', atomictemp=True) - fh.write(struct.pack(">H", cacheversion)) - fh.write(newhash) - fh.write(data) - except (IOError, OSError): - repo.ui.debug('error writing hidden changesets cache') - except error.LockHeld: - repo.ui.debug('cannot obtain lock to write hidden changesets cache') + try: + wlock = repo.wlock(wait=False) + # write cache to file + newhash = cachehash(repo, hideable) + sortedset = sorted(hidden) + data = struct.pack('>%iI' % len(sortedset), *sortedset) + fh = repo.vfs.open(cachefile, 'w+b', atomictemp=True) + fh.write(struct.pack(">H", cacheversion)) + fh.write(newhash) + fh.write(data) + except (IOError, OSError): + repo.ui.debug('error writing hidden changesets cache') + except error.LockHeld: + repo.ui.debug('cannot obtain lock to write hidden changesets cache') finally: if fh: fh.close()