--- a/contrib/shrink-revlog.py Thu Nov 05 01:11:28 2009 +0100
+++ b/contrib/shrink-revlog.py Thu Nov 05 10:44:36 2009 +0100
@@ -87,12 +87,12 @@
count += 1
finally:
write('\n')
-
+
def report(olddatafn, newdatafn):
oldsize = float(os.stat(olddatafn).st_size)
newsize = float(os.stat(newdatafn).st_size)
- # argh: have to pass an int to %d, because a float >= 2^32
+ # argh: have to pass an int to %d, because a float >= 2^32
# blows up under Python 2.5 or earlier
sys.stdout.write('old file size: %12d bytes (%6.1f MiB)\n'
% (int(oldsize), oldsize/1024/1024))
--- a/doc/rst2man.py Thu Nov 05 01:11:28 2009 +0100
+++ b/doc/rst2man.py Thu Nov 05 10:44:36 2009 +0100
@@ -8,7 +8,7 @@
Simple man page writer for reStructuredText.
Man pages (short for "manual pages") contain system documentation on unix-like
-systems. The pages are grouped in numbered sections:
+systems. The pages are grouped in numbered sections:
1 executable programs and shell commands
2 system calls
@@ -140,7 +140,7 @@
text.append('|%s|.\n' % ('|'.join(self._coldefs)))
for row in self._rows:
# row = array of cells. cell = array of lines.
- text.append('_\n') # line above
+ text.append('_\n') # line above
text.append('T{\n')
for i in range(len(row)):
cell = row[i]
@@ -184,8 +184,8 @@
"title" : "", "title_upper": "",
"subtitle" : "",
"manual_section" : "", "manual_group" : "",
- "author" : [],
- "date" : "",
+ "author" : [],
+ "date" : "",
"copyright" : "",
"version" : "",
}
@@ -216,7 +216,7 @@
'literal_block' : ('.sp\n.nf\n.ft C\n', '\n.ft P\n.fi\n'),
'option_list_item' : ('.TP\n', ''),
-
+
'reference' : (r'\%', r'\:'),
'emphasis': ('\\fI', '\\fP'),
'strong' : ('\\fB', '\\fP'),
@@ -263,7 +263,7 @@
elif (self.body[i-1][:3] == '.B ' and
self.body[i-2][:4] == '.TP\n'):
self.body[i] = '.\n'
- elif (self.body[i-1] == '\n' and
+ elif (self.body[i-1] == '\n' and
self.body[i-2][0] != '.' and
(self.body[i-3][:7] == '.TP\n.B '
or self.body[i-3][:4] == '\n.B ')
@@ -564,10 +564,10 @@
def depart_document(self, node):
if self._docinfo['author']:
- self.body.append('.SH AUTHOR\n%s\n'
+ self.body.append('.SH AUTHOR\n%s\n'
% ', '.join(self._docinfo['author']))
skip = ('author', 'copyright', 'date',
- 'manual_group', 'manual_section',
+ 'manual_group', 'manual_section',
'subtitle',
'title', 'title_upper', 'version')
for name in self._docinfo_keys:
@@ -587,7 +587,7 @@
label = self.language.labels.get(name, name)
self.body.append("\n%s: %s\n" % (label, self._docinfo[name]) )
if self._docinfo['copyright']:
- self.body.append('.SH COPYRIGHT\n%s\n'
+ self.body.append('.SH COPYRIGHT\n%s\n'
% self._docinfo['copyright'])
self.body.append( self.comment(
'Generated by docutils manpage writer.\n' ) )
@@ -896,7 +896,7 @@
def visit_paragraph(self, node):
# ``.PP`` : Start standard indented paragraph.
# ``.LP`` : Start block paragraph, all except the first.
- # ``.P [type]`` : Start paragraph type.
+ # ``.P [type]`` : Start paragraph type.
# NOTE dont use paragraph starts because they reset indentation.
# ``.sp`` is only vertical space
self.ensure_eol()
--- a/hgext/convert/darcs.py Thu Nov 05 01:11:28 2009 +0100
+++ b/hgext/convert/darcs.py Thu Nov 05 10:44:36 2009 +0100
@@ -118,7 +118,7 @@
output, status = self.run('revert', all=True, repodir=self.tmppath)
self.checkexit(status, output)
- def getchanges(self, rev):
+ def getchanges(self, rev):
copies = {}
changes = []
man = None
--- a/mercurial/patch.py Thu Nov 05 01:11:28 2009 +0100
+++ b/mercurial/patch.py Thu Nov 05 10:44:36 2009 +0100
@@ -300,7 +300,7 @@
finally:
fp.close()
- def writelines(self, fname, lines):
+ def writelines(self, fname, lines):
# Ensure supplied data ends in fname, being a regular file or
# a symlink. updatedir() will -too magically- take care of
# setting it to the proper type afterwards.
--- a/mercurial/util.py Thu Nov 05 01:11:28 2009 +0100
+++ b/mercurial/util.py Thu Nov 05 10:44:36 2009 +0100
@@ -1223,11 +1223,11 @@
return array.array('h', arri)[1]
except ValueError:
pass
- except IOError, e:
- if e[0] == errno.EINVAL:
- pass
- else:
- raise
+ except IOError, e:
+ if e[0] == errno.EINVAL:
+ pass
+ else:
+ raise
except ImportError:
pass
return 80