# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2018-04-13 11:01:02 # Node ID 575f59cdd8a1d23bae3f787c7bbe9a5e59db8a52 # Parent 34758397ad1b9f8d8a74fc0834e421d9b471a59b lock: don't use 'file' as a variable name Differential Revision: https://phab.mercurial-scm.org/D3320 diff --git a/mercurial/lock.py b/mercurial/lock.py --- a/mercurial/lock.py +++ b/mercurial/lock.py @@ -175,11 +175,11 @@ class lock(object): _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