--- a/hgext/churn.py Fri Jun 19 13:44:23 2009 +0200
+++ b/hgext/churn.py Fri Jun 19 13:47:50 2009 +0200
@@ -120,7 +120,7 @@
It is possible to map alternate email addresses to a main address
by providing a file using the following format:
-
+
<alias email> <actual email>
Such a file may be specified with the --aliases option, otherwise a
--- a/hgext/convert/convcmd.py Fri Jun 19 13:44:23 2009 +0200
+++ b/hgext/convert/convcmd.py Fri Jun 19 13:47:50 2009 +0200
@@ -80,7 +80,7 @@
self.authorfile = None
# Record converted revisions persistently: maps source revision
- # ID to target revision ID (both strings). (This is how
+ # ID to target revision ID (both strings). (This is how
# incremental conversions work.)
self.map = mapfile(ui, revmapfile)
@@ -297,7 +297,7 @@
parents = [self.map.get(p, p) for p in parents]
except KeyError:
parents = [b[0] for b in pbranches]
- newnode = self.dest.putcommit(files, copies, parents, commit,
+ newnode = self.dest.putcommit(files, copies, parents, commit,
self.source, self.map)
self.source.converted(rev, newnode)
self.map[rev] = newnode
--- a/hgext/convert/p4.py Fri Jun 19 13:44:23 2009 +0200
+++ b/hgext/convert/p4.py Fri Jun 19 13:47:50 2009 +0200
@@ -159,7 +159,7 @@
if code == "error":
raise IOError(d["generic"], data)
-
+
elif code == "stat":
p4type = self.re_type.match(d["type"])
if p4type:
@@ -173,7 +173,7 @@
keywords = self.re_keywords_old
elif "k" in flags:
keywords = self.re_keywords
-
+
elif code == "text" or code == "binary":
contents += data
--- a/hgext/convert/subversion.py Fri Jun 19 13:44:23 2009 +0200
+++ b/hgext/convert/subversion.py Fri Jun 19 13:47:50 2009 +0200
@@ -472,7 +472,7 @@
# 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
+ addeds = dict((p, e.copyfrom_path) for p, e
in origpaths.iteritems() if e.action == 'A')
badroots = set()
for destroot in addeds:
@@ -484,7 +484,7 @@
break
for badroot in badroots:
- pendings = [p for p in pendings if p[2] != badroot
+ pendings = [p for p in pendings if p[2] != badroot
and not p[2].startswith(badroot + '/')]
# Tell tag renamings from tag creations
@@ -497,7 +497,7 @@
if tagname in tags:
# Keep the latest tag value
continue
- # From revision may be fake, get one with changes
+ # From revision may be fake, get one with changes
try:
tagid = self.latest(source, sourcerev)
if tagid and tagname not in tags:
--- a/mercurial/dispatch.py Fri Jun 19 13:44:23 2009 +0200
+++ b/mercurial/dispatch.py Fri Jun 19 13:47:50 2009 +0200
@@ -224,7 +224,6 @@
# but only if they have been defined prior to the current definition.
for alias, definition in ui.configitems('alias'):
aliasdef = cmdalias(alias, definition, cmdtable)
-
cmdtable[alias] = (aliasdef, aliasdef.opts, aliasdef.help)
if aliasdef.norepo:
commands.norepo += ' %s' % alias
--- a/mercurial/patch.py Fri Jun 19 13:44:23 2009 +0200
+++ b/mercurial/patch.py Fri Jun 19 13:47:50 2009 +0200
@@ -972,7 +972,7 @@
def applydiff(ui, fp, changed, strip=1, sourcefile=None, reverse=False,
eol=None):
"""
- Reads a patch from fp and tries to apply it.
+ Reads a patch from fp and tries to apply it.
The dict 'changed' is filled in with all of the filenames changed
by the patch. Returns 0 for a clean patch, -1 if any rejects were
@@ -1137,7 +1137,7 @@
eol = {'strict': None, 'crlf': '\r\n', 'lf': '\n'}[eolmode.lower()]
except KeyError:
raise util.Abort(_('Unsupported line endings type: %s') % eolmode)
-
+
try:
fp = file(patchobj, 'rb')
except TypeError:
--- a/tests/run-tests.py Fri Jun 19 13:44:23 2009 +0200
+++ b/tests/run-tests.py Fri Jun 19 13:47:50 2009 +0200
@@ -16,7 +16,7 @@
# If you change this script, it is recommended that you ensure you
# haven't broken it by running it in various modes with a representative
# sample of test scripts. For example:
-#
+#
# 1) serial, no coverage, temp install:
# ./run-tests.py test-s*
# 2) serial, no coverage, local hg: