Martin Geisler <mg@lazybytes.net> [Fri, 18 Jun 2010 20:06:32 +0200] rev 11381
Merge with main
Lee Cantey <lcantey@gmail.com> [Fri, 18 Jun 2010 10:45:40 -0700] rev 11380
Ignore mercurial.egg-info build output
Matt Mackall <mpm@selenic.com> [Thu, 17 Jun 2010 15:54:26 -0500] rev 11379
bookmarks: add support for push --bookmark to export bookmarks
Matt Mackall <mpm@selenic.com> [Thu, 17 Jun 2010 14:26:23 -0500] rev 11378
bookmarks: add support for pull --bookmark to import remote bookmarks
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 17 Jun 2010 15:51:27 +0200] rev 11377
patch: inline small, single-use 'write' function
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 17 Jun 2010 15:50:35 +0200] rev 11376
patch: inline small, single-use 'close' function
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 17 Jun 2010 15:53:26 +0200] rev 11375
mq: __str__ falls back to __repr__
Matt Mackall <mpm@selenic.com> [Thu, 17 Jun 2010 12:22:21 -0500] rev 11374
bookmarks: update known bookmarks on the target on push
Matt Mackall <mpm@selenic.com> [Thu, 17 Jun 2010 12:10:47 -0500] rev 11373
bookmarks: pull known bookmarks from server that are newer
Matt Mackall <mpm@selenic.com> [Thu, 17 Jun 2010 11:01:51 -0500] rev 11372
bookmarks: add pushkey server-side support
Matt Mackall <mpm@selenic.com> [Wed, 16 Jun 2010 16:05:47 -0500] rev 11371
pushkey: add debugpushkey command for testing
Matt Mackall <mpm@selenic.com> [Wed, 16 Jun 2010 16:05:19 -0500] rev 11370
pushkey: add http support
pushkey requires the same permissions as push
listitems requires the same permissions as pull
Matt Mackall <mpm@selenic.com> [Wed, 16 Jun 2010 16:05:13 -0500] rev 11369
pushkey: add ssh support
Matt Mackall <mpm@selenic.com> [Wed, 16 Jun 2010 16:04:46 -0500] rev 11368
pushkey: add localrepo support
Matt Mackall <mpm@selenic.com> [Wed, 16 Jun 2010 16:04:44 -0500] rev 11367
pushkey: add pushkey core
Matt Mackall <mpm@selenic.com> [Wed, 16 Jun 2010 15:01:09 -0500] rev 11366
sshrepo: sort arguments
All current commands have zero or one args. Future multi-arg commands
will want args to appear in a deterministic order.
Greg Ward <greg-hg@gerg.ca> [Wed, 16 Jun 2010 22:00:02 -0400] rev 11365
mq: make 'qdelete <patchidx>' work again.
This just backs out
1abd9442727c (a minor code cleanup that
accidentally broke qdelete) and adds a test.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11364
bdiff.c: Added support for py3k.
This patch adds support for py3k in bdiff.c. This is accomplished by including
a header file responsible for abstracting the API differences between python 2
and python 3.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11363
diffhelpers.c: Added support for py3k.
This patch adds support for py3k in diffhelpers.c. This is accomplished by
including a header file responsible for abstracting the API differences between
python 2 and python 3.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11362
base85.c: Added support for py3k.
This patch adds support for py3k in base85.c. This is accomplished by including
a header file responsible for abstracting the API differences between python 2
and python 3.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11361
parsers.c: Added support for py3k.
This patch adds support for py3k in parsers.c. This is accomplished by including
a header file responsible for abstracting the API differences between python 2
and python 3.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11360
mpatch.c: Added preliminary support for py3k.
This is done by including the util.h header file, that defines appropriate
macros according to the current python version.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11359
osutil.c: Support for py3k added.
This patch adds support for py3k in osutil.c. This is accomplished by including
a header file responsible for abstracting the API differences between python 2
and python 3.
listdir_stat_type is also changed in the following way: A previous call to
PyObject_HEAD_INIT is substituted to a call to PyVarObject_HEAD_INIT, which
makes the object buildable in both python 2.x and 3.x without weird warnings.
After testing on windows, some modifications were also made in the posixfile
function, as it calls PyFile_FromFile and PyFile_SetBufSize, which are gone in
py3k. In py3k the PyFile_* API is, actually a wrapper over the io module, and
code has been adapted accordingly to fit py3k.
Renato Cunha <renatoc@gmail.com> [Tue, 15 Jun 2010 19:49:56 -0300] rev 11358
util.h: Utility macros for handling different Python APIs.
If we are in py3k, a IS_PY3K symbol is defined. Apart from that, byte strings
use the API defined in Python 2.6+ (_?PyBytes_.*). For Python < 2.6, the bytes
API is defined accordingly for mercurial usage (shameless copy from
bytesobject.h from Python's code). Some macros were backported from 2.6, as
inspired by rPath's pycompat.h.