[PATCH] keyword: try for more consistency in the use of super
Christian Ebert
blacktrash at gmx.net
Fri Jul 3 04:46:48 CDT 2009
# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1246614316 -7200
# Node ID 550ea178314bd8ed952aa0611af04e80687d70f3
# Parent fc5737e491939f19530b6e138909df51a7f44d73
keyword: try for more consistency in the use of super
Also prefer repo.sopener over kwrepo.sopener.
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -453,7 +453,7 @@
def file(self, f):
if f[0] == '/':
f = f[1:]
- return kwfilelog(self.sopener, kwt, f)
+ return kwfilelog(repo.sopener, kwt, f)
def wread(self, filename):
data = super(kwrepo, self).wread(filename)
@@ -470,8 +470,8 @@
def kwcommitctx(self, ctx, error=False):
wlock = lock = None
try:
- wlock = self.wlock()
- lock = self.lock()
+ wlock = super(kwrepo, self).wlock()
+ lock = super(kwrepo, self).lock()
# store and postpone commit hooks
commithooks = {}
for name, cmd in ui.configitems('hooks'):
@@ -489,7 +489,8 @@
if commithooks:
for name, cmd in commithooks.iteritems():
ui.setconfig('hooks', name, cmd)
- repo.hook('commit', node=n, parent1=xp1, parent2=xp2)
+ super(kwrepo, self).hook('commit',
+ node=n, parent1=xp1, parent2=xp2)
return n
finally:
release(lock, wlock)
More information about the Mercurial-devel
mailing list