Mercurial > hg
view tests/test-issue672.out @ 11359:4eaacccbb2ca
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.
author | Renato Cunha <renatoc@gmail.com> |
---|---|
date | Tue, 15 Jun 2010 19:49:56 -0300 |
parents | f2618cacb485 |
children | db426935fa94 |
line wrap: on
line source
adding 1 adding 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 checking for directory renames resolving manifests overwrite None partial False ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a 1: other deleted -> r 1a: remote created -> g update: 1 1/2 files (50.00%) removing 1 update: 1a 2/2 files (100.00%) getting 1a 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 1 files removed, 0 files unresolved searching for copies back to rev 1 unmatched files in local: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames resolving manifests overwrite None partial False ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 1a: local copied/moved to 1 -> m preserving 1a for resolve of 1a update: 1a 1/1 files (100.00%) picked tool 'internal:merge' for 1a (binary False symlink False) merging 1a and 1 to 1a my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d premerge successful 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved searching for copies back to rev 1 unmatched files in other: 1a all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames resolving manifests overwrite None partial False ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 1: remote moved to 1a -> m preserving 1 for resolve of 1a removing 1 update: 1 1/1 files (100.00%) picked tool 'internal:merge' for 1a (binary False symlink False) merging 1 and 1a to 1a my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d premerge successful 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)