--- a/hgext/convert/subversion.py Fri Sep 18 17:37:51 2009 +0200
+++ b/hgext/convert/subversion.py Sat Sep 19 01:15:38 2009 +0200
@@ -531,7 +531,7 @@
"""
if not path.startswith(self.rootmodule):
# Requests on foreign branches may be forbidden at server level
- self.ui.debug(_('ignoring foreign branch %r\n') % path)
+ self.ui.debug('ignoring foreign branch %r\n' % path)
return None
if not stop:
@@ -559,7 +559,7 @@
if not path.startswith(p) or not paths[p].copyfrom_path:
continue
newpath = paths[p].copyfrom_path + path[len(p):]
- self.ui.debug(_("branch renamed from %s to %s at %d\n") %
+ self.ui.debug("branch renamed from %s to %s at %d\n" %
(path, newpath, revnum))
path = newpath
break
@@ -567,7 +567,7 @@
stream.close()
if not path.startswith(self.rootmodule):
- self.ui.debug(_('ignoring foreign branch %r\n') % path)
+ self.ui.debug('ignoring foreign branch %r\n' % path)
return None
return self.revid(dirent.created_rev, path)
@@ -579,7 +579,7 @@
prevmodule = self.prevmodule
if prevmodule is None:
prevmodule = ''
- self.ui.debug(_("reparent to %s\n") % svnurl)
+ self.ui.debug("reparent to %s\n" % svnurl)
svn.ra.reparent(self.ra, svnurl)
self.prevmodule = module
return prevmodule
@@ -612,14 +612,14 @@
copyfrom_path = self.getrelpath(ent.copyfrom_path, pmodule)
if not copyfrom_path:
continue
- self.ui.debug(_("copied to %s from %s@%s\n") %
+ self.ui.debug("copied to %s from %s@%s\n" %
(entrypath, copyfrom_path, ent.copyfrom_rev))
copies[self.recode(entrypath)] = self.recode(copyfrom_path)
elif kind == 0: # gone, but had better be a deleted *file*
- self.ui.debug(_("gone from %s\n") % ent.copyfrom_rev)
+ self.ui.debug("gone from %s\n" % ent.copyfrom_rev)
pmodule, prevnum = self.revsplit(parents[0])[1:]
parentpath = pmodule + "/" + entrypath
- self.ui.debug(_("entry %s\n") % parentpath)
+ self.ui.debug("entry %s\n" % parentpath)
# We can avoid the reparent calls if the module has
# not changed but it probably does not worth the pain.
@@ -646,7 +646,7 @@
del copies[childpath]
entries.append(childpath)
else:
- self.ui.debug(_('unknown path in revision %d: %s\n') % \
+ self.ui.debug('unknown path in revision %d: %s\n' % \
(revnum, path))
elif kind == svn.core.svn_node_dir:
# If the directory just had a prop change,
@@ -679,7 +679,7 @@
if not copyfrompath:
continue
copyfrom[path] = ent
- self.ui.debug(_("mark %s came from %s:%d\n")
+ self.ui.debug("mark %s came from %s:%d\n"
% (path, copyfrompath, ent.copyfrom_rev))
children = self._find_children(ent.copyfrom_path, ent.copyfrom_rev)
children.sort()
@@ -703,7 +703,7 @@
"""Return the parsed commit object or None, and True if
the revision is a branch root.
"""
- self.ui.debug(_("parsing revision %d (%d changes)\n") %
+ self.ui.debug("parsing revision %d (%d changes)\n" %
(revnum, len(orig_paths)))
branched = False
@@ -732,7 +732,7 @@
self.ui.note(_('found parent of branch %s at %d: %s\n') %
(self.module, prevnum, prevmodule))
else:
- self.ui.debug(_("no copyfrom path, don't know what to do.\n"))
+ self.ui.debug("no copyfrom path, don't know what to do.\n")
paths = []
# filter out unrelated paths
@@ -785,7 +785,7 @@
lastonbranch = True
break
if not paths:
- self.ui.debug(_('revision %d has no entries\n') % revnum)
+ self.ui.debug('revision %d has no entries\n' % revnum)
continue
cset, lastonbranch = parselogentry(paths, revnum, author,
date, message)
@@ -867,7 +867,7 @@
return relative
# The path is outside our tracked tree...
- self.ui.debug(_('%r is not under %r, ignoring\n') % (path, module))
+ self.ui.debug('%r is not under %r, ignoring\n' % (path, module))
return None
def _checkpath(self, path, revnum):