--- a/hgext/convert/subversion.py Wed Aug 05 15:00:44 2009 +0200
+++ b/hgext/convert/subversion.py Wed Aug 05 17:08:28 2009 +0200
@@ -311,7 +311,7 @@
self.module += '/' + trunk
self.head = self.latest(self.module, self.last_changed)
if not self.head:
- raise util.Abort(_('no revision found in module %s')
+ raise util.Abort(_('no revision found in module %s')
% self.module)
# First head in the list is the module's head
@@ -454,8 +454,8 @@
# Here/tags/tag.1 discarded as well as its children.
# It happens with tools like cvs2svn. Such tags cannot
# be represented in mercurial.
- addeds = dict((p, e.copyfrom_path) for p, e
- in origpaths.iteritems()
+ addeds = dict((p, e.copyfrom_path) for p, e
+ in origpaths.iteritems()
if e.action == 'A' and e.copyfrom_path)
badroots = set()
for destroot in addeds:
--- a/mercurial/tags.py Wed Aug 05 15:00:44 2009 +0200
+++ b/mercurial/tags.py Wed Aug 05 17:08:28 2009 +0200
@@ -210,7 +210,7 @@
# have no <tagnode>. The cache is ordered from tip to oldest (which
# is part of why <headrev> is there: a quick visual check is all
# that's required to ensure correct order).
- #
+ #
# This information is enough to let us avoid the most expensive part
# of finding global tags, which is looking up <tagnode> in the
# manifest for each head.
@@ -243,9 +243,8 @@
return (None, None, tags, False)
if cachefile:
cachefile.close() # ignore rest of file
-
+
repoheads = repo.heads()
-
# Case 2 (uncommon): empty repo; get out quickly and don't bother
# writing an empty cache.
if repoheads == [nullid]:
--- a/mercurial/ui.py Wed Aug 05 15:00:44 2009 +0200
+++ b/mercurial/ui.py Wed Aug 05 17:08:28 2009 +0200
@@ -288,7 +288,7 @@
"""Prompt user with msg, read response, and ensure it matches
one of the provided choices. The index of the choice is returned.
choices is a sequence of acceptable responses with the format:
- ('&None', 'E&xec', 'Sym&link') Responses are case insensitive.
+ ('&None', 'E&xec', 'Sym&link') Responses are case insensitive.
If ui is not interactive, the default is returned.
"""
resps = [s[s.index('&')+1].lower() for s in choices]