py3kcompat: added fake ord implementation for py3k
In py3k, a bytes object __getitem__ will return an int instead of a
one-character bytes object. This has negative consequences when we want to
ord(), like in the following example:
>>> b'foo'[0]
102
>>> ord(b'foo'[0])
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: ord() expected string of length 1, but int found
This patch overrides the default ord() implementation to just return an int
that's what is passed as an argument for ord(). Making the above call succeed:
>>> ord(b'foo'[0])
102
% init
adding a
% fold in the middle of the queue
popping p3
popping p2
now at: p1
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
a
+a
p1
p3
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
a
+a
+b
% fold with local changes
abort: local changes found, refresh first
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
a
+a
+b
reverting a
% fold git patch into a regular patch, expect git patch
popping git
now at: regular
# HG changeset patch
# Parent
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
a
a
b
+a
diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,3 +1,4 @@
a
a
b
+a
popping regular
now at: p1
% fold regular patch into a git patch, expect git patch
popping regular
now at: git
# HG changeset patch
# Parent
diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,3 +1,4 @@
a
a
b
+b