--- a/mercurial/commands.py Thu Mar 11 15:52:17 2010 +0100
+++ b/mercurial/commands.py Thu Mar 11 17:43:44 2010 +0100
@@ -13,7 +13,7 @@
import patch, help, mdiff, url, encoding, templatekw
import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server, hgweb_mod, hgwebdir_mod
-import merge as merge_
+import merge as mergemod
import minirst
# Commands start here, listed alphabetically
@@ -2596,7 +2596,7 @@
raise util.Abort(_('no files or directories specified; '
'use --all to remerge all files'))
- ms = merge_.mergestate(repo)
+ ms = mergemod.mergestate(repo)
m = cmdutil.match(repo, pats, opts)
for f in ms:
@@ -3083,7 +3083,7 @@
ui.status(m)
st = list(repo.status(unknown=True))[:6]
- ms = merge_.mergestate(repo)
+ ms = mergemod.mergestate(repo)
st.append([f for f in ms if ms[f] == 'u'])
labels = [_('%d modified'), _('%d added'), _('%d removed'),
_('%d deleted'), _('%d unknown'), _('%d ignored'),
--- a/mercurial/dispatch.py Thu Mar 11 15:52:17 2010 +0100
+++ b/mercurial/dispatch.py Thu Mar 11 17:43:44 2010 +0100
@@ -9,7 +9,7 @@
import os, sys, atexit, signal, pdb, socket, errno, shlex, time
import util, commands, hg, fancyopts, extensions, hook, error
import cmdutil, encoding
-import ui as _ui
+import ui as uimod
def run():
"run the command in sys.argv"
@@ -18,7 +18,7 @@
def dispatch(args):
"run the command specified in args"
try:
- u = _ui.ui()
+ u = uimod.ui()
if '--traceback' in args:
u.setconfig('ui', 'traceback', 'on')
except util.Abort, inst:
--- a/mercurial/hg.py Thu Mar 11 15:52:17 2010 +0100
+++ b/mercurial/hg.py Thu Mar 11 17:43:44 2010 +0100
@@ -10,8 +10,8 @@
from lock import release
import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
import lock, util, extensions, error, encoding, node
-import merge as _merge
-import verify as _verify
+import merge as mergemod
+import verify as verifymod
import errno, os, shutil
def _local(path):
@@ -358,7 +358,7 @@
def update(repo, node):
"""update the working directory to node, merging linear changes"""
- stats = _merge.update(repo, node, False, False, None)
+ stats = mergemod.update(repo, node, False, False, None)
_showstats(repo, stats)
if stats[3]:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
@@ -369,14 +369,14 @@
def clean(repo, node, show_stats=True):
"""forcibly switch the working directory to node, clobbering changes"""
- stats = _merge.update(repo, node, False, True, None)
+ stats = mergemod.update(repo, node, False, True, None)
if show_stats:
_showstats(repo, stats)
return stats[3] > 0
def merge(repo, node, force=None, remind=True):
"""branch merge with node, resolving changes"""
- stats = _merge.update(repo, node, True, force, False)
+ stats = mergemod.update(repo, node, True, force, False)
_showstats(repo, stats)
if stats[3]:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
@@ -387,8 +387,8 @@
def revert(repo, node, choose):
"""revert changes to revision in node without updating dirstate"""
- return _merge.update(repo, node, False, True, choose)[3] > 0
+ return mergemod.update(repo, node, False, True, choose)[3] > 0
def verify(repo):
"""verify the consistency of a repository"""
- return _verify.verify(repo)
+ return verifymod.verify(repo)
--- a/mercurial/localrepo.py Thu Mar 11 15:52:17 2010 +0100
+++ b/mercurial/localrepo.py Thu Mar 11 17:43:44 2010 +0100
@@ -11,9 +11,9 @@
import changelog, dirstate, filelog, manifest, context
import lock, transaction, store, encoding
import util, extensions, hook, error
-import match as match_
-import merge as merge_
-import tags as tags_
+import match as matchmod
+import merge as mergemod
+import tags as tagsmod
from lock import release
import weakref, stat, errno, os, time, inspect
propertycache = util.propertycache
@@ -207,7 +207,7 @@
if '.hgtags' not in self.dirstate:
self.add(['.hgtags'])
- m = match_.exact(self.root, '', ['.hgtags'])
+ m = matchmod.exact(self.root, '', ['.hgtags'])
tagnode = self.commit(message, user, date, extra=extra, match=m)
for name in names:
@@ -268,8 +268,8 @@
alltags = {} # map tag name to (node, hist)
tagtypes = {}
- tags_.findglobaltags(self.ui, self, alltags, tagtypes)
- tags_.readlocaltags(self.ui, self, alltags, tagtypes)
+ tagsmod.findglobaltags(self.ui, self, alltags, tagtypes)
+ tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
# Build the return dicts. Have to re-encode tag names because
# the tags module always uses UTF-8 (in order not to lose info
@@ -503,7 +503,7 @@
for pat, cmd in self.ui.configitems(filter):
if cmd == '!':
continue
- mf = match_.match(self.root, '', [pat])
+ mf = matchmod.match(self.root, '', [pat])
fn = None
params = cmd
for name, filterfn in self._datafilters.iteritems():
@@ -767,7 +767,7 @@
raise util.Abort('%s: %s' % (f, msg))
if not match:
- match = match_.always(self.root, '')
+ match = matchmod.always(self.root, '')
if not force:
vdirs = []
@@ -824,7 +824,7 @@
and self[None].branch() == self['.'].branch()):
return None
- ms = merge_.mergestate(self)
+ ms = mergemod.mergestate(self)
for f in changes[0]:
if f in ms and ms[f] == 'u':
raise util.Abort(_("unresolved merge conflicts "
@@ -996,7 +996,7 @@
working = ctx2.rev() is None
parentworking = working and ctx1 == self['.']
- match = match or match_.always(self.root, self.getcwd())
+ match = match or matchmod.always(self.root, self.getcwd())
listignored, listclean, listunknown = ignored, clean, unknown
# load earliest manifest first for caching reasons
--- a/mercurial/pure/osutil.py Thu Mar 11 15:52:17 2010 +0100
+++ b/mercurial/pure/osutil.py Thu Mar 11 17:43:44 2010 +0100
@@ -6,25 +6,25 @@
# GNU General Public License version 2 or any later version.
import os
-import stat as _stat
+import stat as statmod
posixfile = open
def _mode_to_kind(mode):
- if _stat.S_ISREG(mode):
- return _stat.S_IFREG
- if _stat.S_ISDIR(mode):
- return _stat.S_IFDIR
- if _stat.S_ISLNK(mode):
- return _stat.S_IFLNK
- if _stat.S_ISBLK(mode):
- return _stat.S_IFBLK
- if _stat.S_ISCHR(mode):
- return _stat.S_IFCHR
- if _stat.S_ISFIFO(mode):
- return _stat.S_IFIFO
- if _stat.S_ISSOCK(mode):
- return _stat.S_IFSOCK
+ if statmod.S_ISREG(mode):
+ return statmod.S_IFREG
+ if statmod.S_ISDIR(mode):
+ return statmod.S_IFDIR
+ if statmod.S_ISLNK(mode):
+ return statmod.S_IFLNK
+ if statmod.S_ISBLK(mode):
+ return statmod.S_IFBLK
+ if statmod.S_ISCHR(mode):
+ return statmod.S_IFCHR
+ if statmod.S_ISFIFO(mode):
+ return statmod.S_IFIFO
+ if statmod.S_ISSOCK(mode):
+ return statmod.S_IFSOCK
return mode
def listdir(path, stat=False, skip=None):
@@ -49,7 +49,7 @@
names.sort()
for fn in names:
st = os.lstat(prefix + fn)
- if fn == skip and _stat.S_ISDIR(st.st_mode):
+ if fn == skip and statmod.S_ISDIR(st.st_mode):
return []
if stat:
result.append((fn, _mode_to_kind(st.st_mode), st))