--- a/hgext/convert/subversion.py Sun May 08 20:42:28 2011 +0200
+++ b/hgext/convert/subversion.py Sun May 08 20:45:47 2011 +0200
@@ -1004,7 +1004,7 @@
self.opener = scmutil.opener(self.wc)
self.wopener = scmutil.opener(self.wc)
self.childmap = mapfile(ui, self.join('hg-childmap'))
- self.is_exec = util.checkexec(self.wc) and util.is_exec or None
+ self.is_exec = util.checkexec(self.wc) and util.isexec or None
if created:
hook = os.path.join(created, 'hooks', 'pre-revprop-change')
--- a/mercurial/dirstate.py Sun May 08 20:42:28 2011 +0200
+++ b/mercurial/dirstate.py Sun May 08 20:45:47 2011 +0200
@@ -138,7 +138,7 @@
p = self._join(x)
if os.path.islink(p):
return 'l'
- if util.is_exec(p):
+ if util.isexec(p):
return 'x'
return ''
return f
@@ -153,7 +153,7 @@
def f(x):
if 'l' in fallback(x):
return 'l'
- if util.is_exec(self._join(x)):
+ if util.isexec(self._join(x)):
return 'x'
return ''
return f
--- a/mercurial/posix.py Sun May 08 20:42:28 2011 +0200
+++ b/mercurial/posix.py Sun May 08 20:45:47 2011 +0200
@@ -44,7 +44,7 @@
args = user and ("%s@%s" % (user, host)) or host
return port and ("%s -p %s" % (args, port)) or args
-def is_exec(f):
+def isexec(f):
"""check whether a file is executable"""
return (os.lstat(f).st_mode & 0100 != 0)