--- a/hgext/convert/subversion.py Fri May 06 15:19:48 2011 +0200
+++ b/hgext/convert/subversion.py Fri May 06 15:22:31 2011 +0200
@@ -1011,7 +1011,7 @@
fp = open(hook, 'w')
fp.write(pre_revprop_change)
fp.close()
- util.set_flags(hook, False, True)
+ util.setflags(hook, False, True)
output = self.run0('info')
self.uuid = self.uuid_re.search(output).group(1).strip()
@@ -1038,7 +1038,7 @@
# systematically is just as expensive and much simpler.
was_exec = 'x' not in flags
- util.set_flags(self.wjoin(filename), False, 'x' in flags)
+ util.setflags(self.wjoin(filename), False, 'x' in flags)
if was_exec:
if 'x' not in flags:
self.delexec.append(filename)
--- a/hgext/extdiff.py Fri May 06 15:19:48 2011 +0200
+++ b/hgext/extdiff.py Fri May 06 15:22:31 2011 +0200
@@ -99,7 +99,7 @@
else:
wopener.write(wfn, data)
if 'x' in fctx.flags():
- util.set_flags(dest, False, True)
+ util.setflags(dest, False, True)
if node is None:
fns_and_mtime.append((dest, repo.wjoin(fn),
os.lstat(dest).st_mtime))
--- a/mercurial/cmdutil.py Fri May 06 15:19:48 2011 +0200
+++ b/mercurial/cmdutil.py Fri May 06 15:22:31 2011 +0200
@@ -369,7 +369,7 @@
if gp.op == 'ADD' and not os.path.lexists(dst):
flags = (isexec and 'x' or '') + (islink and 'l' or '')
repo.wwrite(gp.path, '', flags)
- util.set_flags(dst, islink, isexec)
+ util.setflags(dst, islink, isexec)
addremove(repo, cfiles, similarity=similarity)
files = patches.keys()
files.extend([r for r in removes if r not in files])
--- a/mercurial/localrepo.py Fri May 06 15:19:48 2011 +0200
+++ b/mercurial/localrepo.py Fri May 06 15:22:31 2011 +0200
@@ -659,7 +659,7 @@
else:
self.wopener.write(filename, data)
if 'x' in flags:
- util.set_flags(self.wjoin(filename), False, True)
+ util.setflags(self.wjoin(filename), False, True)
def wwritedata(self, filename, data):
return self._filter(self._decodefilterpats, filename, data)
--- a/mercurial/merge.py Fri May 06 15:19:48 2011 +0200
+++ b/mercurial/merge.py Fri May 06 15:22:31 2011 +0200
@@ -336,7 +336,7 @@
updated += 1
else:
merged += 1
- util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
+ util.setflags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
if (move and repo.dirstate.normalize(fd) != f
and os.path.lexists(repo.wjoin(f))):
repo.ui.debug("removing %s\n" % f)
@@ -370,7 +370,7 @@
repo.ui.warn(" %s\n" % nf)
elif m == "e": # exec
flags = a[2]
- util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
+ util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
ms.commit()
u.progress(_('updating'), None, total=numupdates, unit=_('files'))
--- a/mercurial/posix.py Fri May 06 15:19:48 2011 +0200
+++ b/mercurial/posix.py Fri May 06 15:22:31 2011 +0200
@@ -48,7 +48,7 @@
"""check whether a file is executable"""
return (os.lstat(f).st_mode & 0100 != 0)
-def set_flags(f, l, x):
+def setflags(f, l, x):
s = os.lstat(f).st_mode
if l:
if not stat.S_ISLNK(s):
--- a/mercurial/windows.py Fri May 06 15:19:48 2011 +0200
+++ b/mercurial/windows.py Fri May 06 15:22:31 2011 +0200
@@ -87,7 +87,7 @@
args = user and ("%s@%s" % (user, host)) or host
return port and ("%s %s %s" % (args, pflag, port)) or args
-def set_flags(f, l, x):
+def setflags(f, l, x):
pass
def checkexec(path):