--- a/hgext/fastannotate/context.py Tue Sep 17 14:20:13 2019 -0400
+++ b/hgext/fastannotate/context.py Tue Sep 17 14:22:22 2019 -0400
@@ -759,21 +759,6 @@
def lock(self):
return lockmod.lock(self._repo.vfs, self._vfspath + '.lock')
- @contextlib.contextmanager
- def _lockflock(self):
- """the same as 'lock' but use flock instead of lockmod.lock, to avoid
- creating temporary symlinks."""
- import fcntl
- lockpath = self.linelogpath
- util.makedirs(os.path.dirname(lockpath))
- lockfd = os.open(lockpath, os.O_RDONLY | os.O_CREAT, 0o664)
- fcntl.flock(lockfd, fcntl.LOCK_EX)
- try:
- yield
- finally:
- fcntl.flock(lockfd, fcntl.LOCK_UN)
- os.close(lockfd)
-
@property
def revmappath(self):
return self._repo.vfs.join(self._vfspath + '.m')