Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:40 -0300] rev 11535
util.h: Defined macros for working "with" PyStrings in py3k.
PyString* functions are defined as PyUnicode* to permit correct compilation in
both python 2.x and 3.x.
Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:38 -0300] rev 11534
util.h: Add a PyInt_AsLong definition for usage in the inotify module.
Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:36 -0300] rev 11533
setup.py: Add 'mercurial' as include dir for the inotify compiler.
This patch adds access to util.h for the inotify C module by adding the
"mercurial" directory as an include dir, enabling access to the macros defined
in util.h.
Renato Cunha <renatoc@gmail.com> [Fri, 02 Jul 2010 16:21:34 -0300] rev 11532
setup.py: Adjustments to make setup.py run in py3k.
In py3k, subprocess.Popen.communicate's output are bytes objects. String
literals are Unicode objects. Thus, when a bytes object startswith method is
called, with string literals, it fails. What this patch does is:
* Convert the string (unicode in py3k) literals to bytes objects;
* As "bytes" is not a builtin in python < 2.6, it defines a "b" helper
function that merely returns its argument, as suggested by Antoine Pitrou.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 13 Jul 2010 20:12:32 +0900] rev 11531
rebase: re-add patches to mq repo after rebase
Since 1b82a26635d7, we are adding patches after the qimport call, and not
inside it anymore. Correct updatemq to match the new behaviour.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 12 Jul 2010 17:55:23 +0900] rev 11530
mq: reset self.added after the mq transaction instead of inside qimport
It seems wiser to reset mq.added at the end of the mq transaction instead of at
the beginning of a qimport call: this way, calling several times qimport()
without saving mq state in-between does not overwrite the previous value of
mq.added (this happens, for example in rebase, where we import several patches
in a batch before calling .save_dirty() )
Matt Mackall <mpm@selenic.com> [Mon, 12 Jul 2010 17:27:32 -0500] rev 11529
Merge with stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 10 Jul 2010 14:28:38 -0300] rev 11528
i18n-pt_BR: synchronized with dec57aa0f8ca