--- a/hgext/convert/common.py Mon Oct 20 17:40:29 2008 +0200
+++ b/hgext/convert/common.py Mon Oct 20 18:29:44 2008 +0200
@@ -80,7 +80,7 @@
raise NotImplementedError()
def getchanges(self, version):
- """Returns a tuple of (files, copies).
+ """Returns a tuple of (files, copies).
files is a sorted list of (filename, id) tuples for all files
changed between version and it's first parent returned by
--- a/hgext/convert/subversion.py Mon Oct 20 17:40:29 2008 +0200
+++ b/hgext/convert/subversion.py Mon Oct 20 18:29:44 2008 +0200
@@ -280,7 +280,7 @@
# Check if branches bring a few more heads to the list
if branches:
rpath = self.url.strip('/')
- branchnames = svn.client.ls(rpath + '/' + urllib.quote(branches),
+ branchnames = svn.client.ls(rpath + '/' + urllib.quote(branches),
rev, False, self.ctx)
for branch in branchnames.keys():
module = '%s/%s/%s' % (oldmodule, branches, branch)
@@ -325,7 +325,7 @@
else:
# Perform a full checkout on roots
uuid, module, revnum = self.revsplit(rev)
- entries = svn.client.ls(self.baseurl + urllib.quote(module),
+ entries = svn.client.ls(self.baseurl + urllib.quote(module),
optrev(revnum), True, self.ctx)
files = [n for n,e in entries.iteritems()
if e.kind == svn.core.svn_node_file]
@@ -872,7 +872,7 @@
path = path.strip('/')
pool = Pool()
rpath = '/'.join([self.baseurl, urllib.quote(path)]).strip('/')
- return ['%s/%s' % (path, x) for x in
+ return ['%s/%s' % (path, x) for x in
svn.client.ls(rpath, optrev(revnum), True, self.ctx, pool).keys()]
def getrelpath(self, path, module=None):
--- a/hgext/mq.py Mon Oct 20 17:40:29 2008 +0200
+++ b/hgext/mq.py Mon Oct 20 18:29:44 2008 +0200
@@ -1787,7 +1787,7 @@
the modifications that match those patterns; the remaining modifications
will remain in the working directory.
- If --short is specified, files currently included in the patch will
+ If --short is specified, files currently included in the patch will
be refreshed just like matched files and remain in the patch.
hg add/remove/copy/rename work as usual, though you might want to use
--- a/mercurial/base85.c Mon Oct 20 17:40:29 2008 +0200
+++ b/mercurial/base85.c Mon Oct 20 18:29:44 2008 +0200
@@ -33,19 +33,19 @@
char *dst;
int len, olen, i;
unsigned int acc, val, ch;
- int pad = 0;
+ int pad = 0;
if (!PyArg_ParseTuple(args, "s#|i", &text, &len, &pad))
return NULL;
- if (pad)
- olen = ((len + 3) / 4 * 5) - 3;
- else {
- olen = len % 4;
- if (olen)
- olen++;
- olen += len / 4 * 5;
- }
+ if (pad)
+ olen = ((len + 3) / 4 * 5) - 3;
+ else {
+ olen = len % 4;
+ if (olen)
+ olen++;
+ olen += len / 4 * 5;
+ }
if (!(out = PyString_FromStringAndSize(NULL, olen + 3)))
return NULL;
@@ -67,8 +67,8 @@
dst += 5;
}
- if (!pad)
- _PyString_Resize(&out, olen);
+ if (!pad)
+ _PyString_Resize(&out, olen);
return out;
}
@@ -140,9 +140,9 @@
static PyMethodDef methods[] = {
{"b85encode", b85encode, METH_VARARGS,
- "Encode text in base85.\n\n"
- "If the second parameter is true, pad the result to a multiple of "
- "five characters.\n"},
+ "Encode text in base85.\n\n"
+ "If the second parameter is true, pad the result to a multiple of "
+ "five characters.\n"},
{"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"},
{NULL, NULL}
};
--- a/mercurial/bdiff.c Mon Oct 20 17:40:29 2008 +0200
+++ b/mercurial/bdiff.c Mon Oct 20 18:29:44 2008 +0200
@@ -80,7 +80,7 @@
h = 0;
for (p = a; p < a + len; p++) {
/* Leonid Yuriev's hash */
- h = (h * 1664525) + *p + 1013904223;
+ h = (h * 1664525) + *p + 1013904223;
if (*p == '\n' || p == plast) {
l->h = h;
--- a/mercurial/osutil.c Mon Oct 20 17:40:29 2008 +0200
+++ b/mercurial/osutil.c Mon Oct 20 18:29:44 2008 +0200
@@ -46,10 +46,10 @@
#endif
#define listdir_slot(name) \
- static PyObject *listdir_stat_##name(PyObject *self, void *x) \
- { \
- return PyInt_FromLong(((struct listdir_stat *)self)->st.name); \
- }
+ static PyObject *listdir_stat_##name(PyObject *self, void *x) \
+ { \
+ return PyInt_FromLong(((struct listdir_stat *)self)->st.name); \
+ }
listdir_slot(st_dev)
listdir_slot(st_mode)
--- a/mercurial/parsers.c Mon Oct 20 17:40:29 2008 +0200
+++ b/mercurial/parsers.c Mon Oct 20 18:29:44 2008 +0200
@@ -144,9 +144,9 @@
static uint32_t ntohl(uint32_t x)
{
return ((x & 0x000000ffUL) << 24) |
- ((x & 0x0000ff00UL) << 8) |
- ((x & 0x00ff0000UL) >> 8) |
- ((x & 0xff000000UL) >> 24);
+ ((x & 0x0000ff00UL) << 8) |
+ ((x & 0x00ff0000UL) >> 8) |
+ ((x & 0xff000000UL) >> 24);
}
#else
/* not windows */
@@ -299,14 +299,14 @@
while (data < end) {
unsigned int step;
-
+
memcpy(decode, data, 64);
- offset_flags = ntohl(*((uint32_t *) (decode + 4)));
- if (n == 0) /* mask out version number for the first entry */
- offset_flags &= 0xFFFF;
- else {
+ offset_flags = ntohl(*((uint32_t *) (decode + 4)));
+ if (n == 0) /* mask out version number for the first entry */
+ offset_flags &= 0xFFFF;
+ else {
uint32_t offset_high = ntohl(*((uint32_t *) decode));
- offset_flags |= ((uint64_t) offset_high) << 32;
+ offset_flags |= ((uint64_t) offset_high) << 32;
}
comp_len = ntohl(*((uint32_t *) (decode + 8)));
@@ -344,9 +344,9 @@
return 0;
}
- /* create the nullid/nullrev entry in the nodemap and the
+ /* create the nullid/nullrev entry in the nodemap and the
* magic nullid entry in the index at [-1] */
- entry = _build_idx_entry(nodemap,
+ entry = _build_idx_entry(nodemap,
nullrev, 0, 0, 0, -1, -1, -1, -1, nullid);
if (!entry)
return 0;
@@ -372,16 +372,16 @@
{
const char *data;
int size, inlined;
- PyObject *rval = NULL, *index = NULL, *nodemap = NULL, *cache = NULL;
+ PyObject *rval = NULL, *index = NULL, *nodemap = NULL, *cache = NULL;
PyObject *data_obj = NULL, *inlined_obj;
if (!PyArg_ParseTuple(args, "s#O", &data, &size, &inlined_obj))
return NULL;
inlined = inlined_obj && PyObject_IsTrue(inlined_obj);
- /* If no data is inlined, we know the size of the index list in
- * advance: size divided by size of one one revlog record (64 bytes)
- * plus one for the nullid */
+ /* If no data is inlined, we know the size of the index list in
+ * advance: size divided by size of one one revlog record (64 bytes)
+ * plus one for the nullid */
index = inlined ? PyList_New(0) : PyList_New(size / 64 + 1);
if (!index)
goto quit;
--- a/mercurial/patch.py Mon Oct 20 17:40:29 2008 +0200
+++ b/mercurial/patch.py Mon Oct 20 18:29:44 2008 +0200
@@ -783,13 +783,13 @@
yield l
def scangitpatch(lr, firstline):
- """
+ """
Git patches can emit:
- rename a to b
- change b
- copy a to c
- change c
-
+
We cannot apply this sequence as-is, the renamed 'a' could not be
found for it would have been renamed already. And we cannot copy
from 'b' instead because 'b' would have been changed already. So
--- a/mercurial/strutil.py Mon Oct 20 17:40:29 2008 +0200
+++ b/mercurial/strutil.py Mon Oct 20 18:29:44 2008 +0200
@@ -37,5 +37,5 @@
try:
return s.rsplit(sep, maxsplit)
except AttributeError:
- return [chunk[::-1] for chunk in
- s[::-1].split(sep, maxsplit)[::-1]]
+ return [chunk[::-1] for chunk in
+ s[::-1].split(sep, maxsplit)[::-1]]
--- a/tests/printenv.py Mon Oct 20 17:40:29 2008 +0200
+++ b/tests/printenv.py Mon Oct 20 18:29:44 2008 +0200
@@ -20,7 +20,7 @@
import msvcrt
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
- msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
+ msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
except ImportError:
pass
--- a/tests/test-doctest.py Mon Oct 20 17:40:29 2008 +0200
+++ b/tests/test-doctest.py Mon Oct 20 18:29:44 2008 +0200
@@ -1,7 +1,7 @@
# this is hack to make sure no escape characters are inserted into the output
import os;
if 'TERM' in os.environ:
- del os.environ['TERM']
+ del os.environ['TERM']
import doctest
import mercurial.changelog