This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5781

py3: fix test-remotefilelog-repack.t
ClosedPublic

Authored by durin42 on Jan 31 2019, 11:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG13dad5cb4b99: py3: fix test-remotefilelog-repack.t
rHGa09f90cb2543: py3: fix test-remotefilelog-repack.t
rHGac14362ced4b: py3: fix test-remotefilelog-repack.t
Summary

This is uglier, but more obviously correct in my opinion. I guess
Python 3 doesn't hang on to the exception as long, which seems
reasonable.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jan 31 2019, 11:20 AM
pulkit accepted this revision.Feb 1 2019, 1:12 PM
Closed by commit rHGac14362ced4b: py3: fix test-remotefilelog-repack.t (authored by durin42). · Explain WhyFeb 1 2019, 1:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13675

contrib/python3-whitelist

test-remotefilelog-keepset.t test-remotefilelog-keepset.t
test-remotefilelog-local.t test-remotefilelog-local.t
test-remotefilelog-log.t test-remotefilelog-log.t
test-remotefilelog-partial-shallow.t test-remotefilelog-partial-shallow.t
test-remotefilelog-permissions.t test-remotefilelog-permissions.t
test-remotefilelog-permisssions.t test-remotefilelog-permisssions.t
test-remotefilelog-prefetch.t test-remotefilelog-prefetch.t
test-remotefilelog-pull-noshallow.t test-remotefilelog-pull-noshallow.t
test-remotefilelog-repack.t
test-remotefilelog-share.t test-remotefilelog-share.t
test-remotefilelog-sparse.t test-remotefilelog-sparse.t
test-remotefilelog-tags.t test-remotefilelog-tags.t
test-remotefilelog-wireproto.t test-remotefilelog-wireproto.t
test-remove.t test-remove.t
test-removeemptydirs.t test-removeemptydirs.t
test-rename-after-merge.t test-rename-after-merge.t
test-rename-dir-merge.t test-rename-dir-merge.t

hgext/remotefilelog/basestore.py

@staticmethod @staticmethod
def retriable(fn): def retriable(fn):
def noop(*args): def noop(*args):
pass pass
def wrapped(self, *args, **kwargs): def wrapped(self, *args, **kwargs):
retrylog = self.retrylog or noop retrylog = self.retrylog or noop
funcname = fn.__name__ funcname = fn.__name__
for i in pycompat.xrange(self.numattempts): i = 0
while i < self.numattempts:
if i > 0: if i > 0:
retrylog('re-attempting (n=%d) %s\n' % (i, funcname)) retrylog('re-attempting (n=%d) %s\n' % (i, funcname))
self.markforrefresh() self.markforrefresh()
i += 1
try: try:
return fn(self, *args, **kwargs) return fn(self, *args, **kwargs)
except KeyError: except KeyError:
pass if i == self.numattempts:
# retries exhausted # retries exhausted
retrylog('retries exhausted in %s, raising KeyError\n' % retrylog('retries exhausted in %s, raising KeyError\n' %
pycompat.sysbytes(funcname)) pycompat.sysbytes(funcname))
raise raise
return wrapped return wrapped