/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/python-compat.h

  • Committer: Vincent Ladeuil
  • Date: 2008-11-21 16:43:53 UTC
  • mto: (3855.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3856.
  • Revision ID: v.ladeuil+lp@free.fr-20081121164353-8d07go33ycibzbwl
Better fix for bug #300055.

* bzrlib/tests/test_log.py:
(TestGetViewRevisions.make_tree_with_many_merges): Hijack the
helper to test for revisions touching file on a more significant
tree.
(TestGetViewRevisions.test_file_id_for_range): Better test to
highlight bug #300055: starting revision is a dotted revno and the
log should start right there, not at the mainline revision where
merging occured. But that uncovers yet another bug...
(TestGetRevisionsTouchingFileID.assertAllRevisionsForFileID):
_filter_revisions_touching_file_id doesn't have a 'direction'
parameter anymore.

* bzrlib/tests/blackbox/test_log.py:
(TestCaseWithoutPropsHandler): Fix line too long.
(TestLog.test_log_with_tags,
TestLogMerges.test_merges_partial_range): Fix whitespaces.

* bzrlib/log.py:
(calculate_view_revisions): Delete gratuitous split line. Push
direction handling closer to the needed point. Delete 'direction'
parameter when calling _filter_revisions_touching_file_id.
(_filter_revisions_touching_file_id): Delete 'direction'
parameter. This was used for calling reverse_by_depth which can't
handle an already reversed list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/python-compat.h
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License
17
17
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
18
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
19
 */
20
20
 
21
21
/* Provide the typedefs that pyrex does automatically in newer versions, to
28
28
/* http://www.python.org/dev/peps/pep-0353/ */
29
29
#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
30
30
    typedef int Py_ssize_t;
31
 
    typedef Py_ssize_t (*lenfunc)(PyObject *);
32
 
    typedef PyObject * (*ssizeargfunc)(PyObject *, Py_ssize_t);
33
 
    typedef PyObject * (*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
34
31
    #define PY_SSIZE_T_MAX INT_MAX
35
32
    #define PY_SSIZE_T_MIN INT_MIN
36
33
    #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
45
42
    #include <windows.h>
46
43
 
47
44
    /* Needed for htonl */
48
 
    #include "Winsock2.h"
 
45
    #include "Winsock.h"
49
46
 
50
47
    /* sys/stat.h doesn't have any of these macro definitions for MSVC, so
51
48
     * we'll define whatever is missing that we actually use.
70
67
    #include "arpa/inet.h"
71
68
#endif
72
69
 
73
 
#include <stdio.h>
74
 
 
75
 
#ifdef _MSC_VER
76
 
#define  snprintf  _snprintf
77
 
#endif
78
 
 
79
 
/* Introduced in Python 2.6 */
80
 
#ifndef Py_TYPE
81
 
#  define Py_TYPE(o) ((o)->ob_type)
82
 
#endif
83
 
#ifndef Py_REFCNT
84
 
#  define Py_REFCNT(o) ((o)->ob_refcnt)
85
 
#endif
86
70
 
87
71
#endif /* _BZR_PYTHON_COMPAT_H */