--- a/hgext/convert/__init__.py Fri Jul 20 09:31:32 2007 +0200
+++ b/hgext/convert/__init__.py Sat Jul 21 10:30:51 2007 +0200
@@ -192,7 +192,7 @@
def copy(self, rev):
c = self.commitcache[rev]
files = self.source.getchanges(rev)
-
+
do_copies = (hasattr(c, 'copies') and hasattr(self.dest, 'copyfile'))
for f, v in files:
--- a/hgext/convert/common.py Fri Jul 20 09:31:32 2007 +0200
+++ b/hgext/convert/common.py Sat Jul 21 10:30:51 2007 +0200
@@ -60,7 +60,7 @@
def recode(self, s, encoding=None):
if not encoding:
encoding = self.encoding or 'utf-8'
-
+
try:
return s.decode(encoding).encode("utf-8")
except:
--- a/hgext/convert/hg.py Fri Jul 20 09:31:32 2007 +0200
+++ b/hgext/convert/hg.py Sat Jul 21 10:30:51 2007 +0200
@@ -58,7 +58,7 @@
extra['branch'] = commit.branch
if commit.rev:
extra['convert_revision'] = commit.rev
-
+
while parents:
p1 = p2
p2 = parents.pop(0)
--- a/hgext/convert/subversion.py Fri Jul 20 09:31:32 2007 +0200
+++ b/hgext/convert/subversion.py Sat Jul 21 10:30:51 2007 +0200
@@ -157,7 +157,7 @@
self.modecache[(file, rev)] = mode
return data
- def getmode(self, file, rev):
+ def getmode(self, file, rev):
return self.modecache[(file, rev)]
def getchanges(self, rev):
@@ -449,7 +449,7 @@
# print "find children %s@%d from %d action %s" % (path, revnum, ent.copyfrom_rev, ent.action)
# Sometimes this is tricky. For example: in
# The Subversion Repository revision 6940 a dir
- # was copied and one of its files was deleted
+ # was copied and one of its files was deleted
# from the new location in the same commit. This
# code can't deal with that yet.
if ent.action == 'C':
@@ -463,7 +463,7 @@
for child in children:
# Can we move a child directory and its
# parent in the same commit? (probably can). Could
- # cause problems if instead of revnum -1,
+ # cause problems if instead of revnum -1,
# we have to look in (copyfrom_path, revnum - 1)
entrypath = get_entry_from_path("/" + child, module=old_module)
if entrypath:
@@ -493,7 +493,7 @@
for child in children:
# Can we move a child directory and its
# parent in the same commit? (probably can). Could
- # cause problems if instead of revnum -1,
+ # cause problems if instead of revnum -1,
# we have to look in (copyfrom_path, revnum - 1)
entrypath = get_entry_from_path("/" + child, module=self.module)
# print child, self.module, entrypath
@@ -542,7 +542,7 @@
self.modulemap[revnum] = self.module # track backwards in time
# a list of (filename, id) where id lets us retrieve the file.
- # eg in git, id is the object hash. for svn it'll be the
+ # eg in git, id is the object hash. for svn it'll be the
self.files[rev] = zip(entries, [rev] * len(entries))
if not entries:
return
@@ -556,8 +556,8 @@
author = author and self.recode(author) or ''
cset = commit(author=author,
- date=util.datestr(date),
- desc=log,
+ date=util.datestr(date),
+ desc=log,
parents=parents,
copies=copies,
branch=branch,
@@ -585,7 +585,7 @@
parselogentry(orig_paths, revnum, author, date, message)
except SubversionException, (_, num):
if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
- raise NoSuchRevision(branch=self,
+ raise NoSuchRevision(branch=self,
revision="Revision number %d" % to_revnum)
raise
--- a/hgext/convert/transport.py Fri Jul 20 09:31:32 2007 +0200
+++ b/hgext/convert/transport.py Sat Jul 21 10:30:51 2007 +0200
@@ -27,7 +27,7 @@
import svn.client
import svn.core
-# Some older versions of the Python bindings need to be
+# Some older versions of the Python bindings need to be
# explicitly initialized. But what we want to do probably
# won't work worth a darn against those libraries anyway!
svn.ra.initialize()
@@ -75,7 +75,7 @@
self.client.config = svn_config
try:
self.ra = svn.client.open_ra_session(
- self.svn_url.encode('utf8'),
+ self.svn_url.encode('utf8'),
self.client, self.pool)
except SubversionException, (_, num):
if num in (svn.core.SVN_ERR_RA_ILLEGAL_URL,
--- a/hgext/purge.py Fri Jul 20 09:31:32 2007 +0200
+++ b/hgext/purge.py Sat Jul 21 10:30:51 2007 +0200
@@ -31,7 +31,7 @@
from mercurial.i18n import _
import os
-def dopurge(ui, repo, dirs=None, act=True, ignored=False,
+def dopurge(ui, repo, dirs=None, act=True, ignored=False,
abort_on_err=False, eol='\n',
force=False, include=None, exclude=None):
def error(msg):
--- a/mercurial/hgweb/hgwebdir_mod.py Fri Jul 20 09:31:32 2007 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py Sat Jul 21 10:30:51 2007 +0200
@@ -244,7 +244,7 @@
if up < 0:
break
virtual = virtual[:up]
-
+
req.write(tmpl("notfound", repo=virtual))
else:
if req.form.has_key('static'):
--- a/mercurial/hgweb/server.py Fri Jul 20 09:31:32 2007 +0200
+++ b/mercurial/hgweb/server.py Sat Jul 21 10:30:51 2007 +0200
@@ -39,7 +39,7 @@
class _hgwebhandler(object, BaseHTTPServer.BaseHTTPRequestHandler):
url_scheme = 'http'
-
+
def __init__(self, *args, **kargs):
self.protocol_version = 'HTTP/1.1'
BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, *args, **kargs)
@@ -173,7 +173,7 @@
class _shgwebhandler(_hgwebhandler):
url_scheme = 'https'
-
+
def setup(self):
self.connection = self.request
self.rfile = socket._fileobject(self.request, "rb", self.rbufsize)