Fri, 02 Jul 2010 16:21:36 -0300 setup.py: Add 'mercurial' as include dir for the inotify compiler.
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.
Fri, 02 Jul 2010 16:21:34 -0300 setup.py: Adjustments to make setup.py run in py3k.
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.
Tue, 13 Jul 2010 20:12:32 +0900 rebase: re-add patches to mq repo after rebase stable
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.
Mon, 12 Jul 2010 17:55:23 +0900 mq: reset self.added after the mq transaction instead of inside qimport stable
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() )
Mon, 12 Jul 2010 17:27:32 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 12 Jul 2010 17:27:32 -0500] rev 11529
Merge with stable
Sat, 10 Jul 2010 14:28:38 -0300 i18n-pt_BR: synchronized with dec57aa0f8ca stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 10 Jul 2010 14:28:38 -0300] rev 11528
i18n-pt_BR: synchronized with dec57aa0f8ca
Sat, 10 Jul 2010 14:01:10 -0300 merge with stable stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 10 Jul 2010 14:01:10 -0300] rev 11527
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip