Mercurial > hg-stable

changeset 37659:575f59cdd8a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lock: don't use 'file' as a variable name Differential Revision: https://phab.mercurial-scm.org/D3320
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 13 Apr 2018 16:31:02 +0530
parents 34758397ad1b
children 9dfa4e9ed45d
files mercurial/lock.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/lock.py	Fri Apr 13 16:30:27 2018 +0530
+++ b/mercurial/lock.py	Fri Apr 13 16:31:02 2018 +0530
@@ -175,11 +175,11 @@
 
     _host = None
 
-    def __init__(self, vfs, file, timeout=-1, releasefn=None, acquirefn=None,
+    def __init__(self, vfs, fname, timeout=-1, releasefn=None, acquirefn=None,
                  desc=None, inheritchecker=None, parentlock=None,
                  dolock=True):
         self.vfs = vfs
-        self.f = file
+        self.f = fname
         self.held = 0
         self.timeout = timeout
         self.releasefn = releasefn