Rev 2341: Doco tweaks. in file:///home/robertc/source/baz/pathinfo/
Robert Collins
robertc at robertcollins.net
Wed Mar 14 01:57:59 GMT 2007
At file:///home/robertc/source/baz/pathinfo/
------------------------------------------------------------
revno: 2341
revision-id: robertc at robertcollins.net-20070314015756-t2sqa3nt1qme5zdt
parent: robertc at robertcollins.net-20070314010639-evk1bw9gapb98efq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pathinfo
timestamp: Wed 2007-03-14 12:57:56 +1100
message:
Doco tweaks.
modified:
bzrlib/path_info_c.c path_info_c.c-20070309072643-pox974xfyuw278hs-1
bzrlib/path_info_c.pyx path_info_c.pyx-20070309072643-pox974xfyuw278hs-2
=== modified file 'bzrlib/path_info_c.c'
--- a/bzrlib/path_info_c.c 2007-03-14 01:06:39 +0000
+++ b/bzrlib/path_info_c.c 2007-03-14 01:57:56 +0000
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.4.1 on Wed Mar 14 11:51:38 2007 */
+/* Generated by Pyrex 0.9.4.1 on Wed Mar 14 12:57:40 2007 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -753,71 +753,71 @@
}
__pyx_L2:;
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":195 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":198 */
__pyx_v_snprintf_result = snprintf(__pyx_v_encoded,96,__pyx_k32,__pyx_v_st.st_size,__pyx_v_st.st_mtime,__pyx_v_st.st_ctime,__pyx_v_st.st_dev,__pyx_v_st.st_ino,__pyx_v_st.st_mode);
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":197 */
- __pyx_5 = PyString_FromString(__pyx_v_encoded); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;}
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":200 */
+ __pyx_5 = PyString_FromString(__pyx_v_encoded); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;}
Py_DECREF(__pyx_v_statcachekey);
__pyx_v_statcachekey = __pyx_5;
__pyx_5 = 0;
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":210 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":201 */
__pyx_3 = (__pyx_v_st.st_ctime < __pyx_v_st.st_mtime);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":211 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":202 */
__pyx_v_recenttime = __pyx_v_st.st_mtime;
goto __pyx_L4;
}
/*else*/ {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":213 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":204 */
__pyx_v_recenttime = __pyx_v_st.st_ctime;
}
__pyx_L4:;
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":216 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":207 */
__pyx_v_mode_value = (__pyx_v_st.st_mode & S_IFMT);
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":217 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":208 */
__pyx_3 = (__pyx_v_mode_value == S_IFREG);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":218 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":209 */
__pyx_1 = (PyObject *)__pyx_v_11path_info_c_kind_file;
Py_INCREF(__pyx_1);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_1;
__pyx_1 = 0;
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":219 */
- __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_bool); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
- __pyx_2 = PyInt_FromLong((S_IXUSR & __pyx_v_st.st_mode)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
- __pyx_7 = PyTuple_New(1); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":210 */
+ __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_bool); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; goto __pyx_L1;}
+ __pyx_2 = PyInt_FromLong((S_IXUSR & __pyx_v_st.st_mode)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; goto __pyx_L1;}
+ __pyx_7 = PyTuple_New(1); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_7, 0, __pyx_2);
__pyx_2 = 0;
- __pyx_5 = PyObject_CallObject(__pyx_6, __pyx_7); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
+ __pyx_5 = PyObject_CallObject(__pyx_6, __pyx_7); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; goto __pyx_L1;}
Py_DECREF(__pyx_6); __pyx_6 = 0;
Py_DECREF(__pyx_7); __pyx_7 = 0;
- __pyx_3 = PyInt_AsLong(__pyx_5); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;}
+ __pyx_3 = PyInt_AsLong(__pyx_5); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; goto __pyx_L1;}
Py_DECREF(__pyx_5); __pyx_5 = 0;
__pyx_v_new_executable = __pyx_3;
goto __pyx_L5;
}
/*else*/ {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":221 */
- __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_False); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; goto __pyx_L1;}
- __pyx_3 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; goto __pyx_L1;}
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":212 */
+ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_False); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
+ __pyx_3 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_new_executable = __pyx_3;
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":222 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":213 */
__pyx_3 = (__pyx_v_mode_value == S_IFDIR);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":223 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":214 */
__pyx_2 = (PyObject *)__pyx_v_11path_info_c__directory_kind;
Py_INCREF(__pyx_2);
Py_DECREF(__pyx_v_kind);
@@ -828,7 +828,7 @@
__pyx_3 = (__pyx_v_mode_value == S_IFLNK);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":225 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":216 */
Py_INCREF(__pyx_n_symlink);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_n_symlink;
@@ -837,7 +837,7 @@
__pyx_3 = (__pyx_v_mode_value == S_IFCHR);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":227 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":218 */
Py_INCREF(__pyx_n_chardev);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_n_chardev;
@@ -846,7 +846,7 @@
__pyx_3 = (__pyx_v_mode_value == S_IFBLK);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":229 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":220 */
Py_INCREF(__pyx_n_block);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_n_block;
@@ -855,7 +855,7 @@
__pyx_3 = (__pyx_v_mode_value == S_IFIFO);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":231 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":222 */
Py_INCREF(__pyx_n_fifo);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_n_fifo;
@@ -864,7 +864,7 @@
__pyx_3 = (__pyx_v_mode_value == S_IFSOCK);
if (__pyx_3) {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":233 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":224 */
Py_INCREF(__pyx_n_socket);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_n_socket;
@@ -872,7 +872,7 @@
}
/*else*/ {
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":235 */
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":226 */
Py_INCREF(__pyx_n_unknown);
Py_DECREF(__pyx_v_kind);
__pyx_v_kind = __pyx_n_unknown;
@@ -881,11 +881,11 @@
}
__pyx_L5:;
- /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":237 */
- __pyx_6 = PyInt_FromLong(__pyx_v_st.st_size); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; goto __pyx_L1;}
- __pyx_7 = PyInt_FromLong(__pyx_v_new_executable); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; goto __pyx_L1;}
- __pyx_5 = PyInt_FromLong(__pyx_v_recenttime); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; goto __pyx_L1;}
- __pyx_1 = PyTuple_New(5); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; goto __pyx_L1;}
+ /* "/home/robertc/source/baz/pathinfo/bzrlib/path_info_c.pyx":228 */
+ __pyx_6 = PyInt_FromLong(__pyx_v_st.st_size); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;}
+ __pyx_7 = PyInt_FromLong(__pyx_v_new_executable); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;}
+ __pyx_5 = PyInt_FromLong(__pyx_v_recenttime); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;}
+ __pyx_1 = PyTuple_New(5); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;}
Py_INCREF(__pyx_v_kind);
PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_kind);
PyTuple_SET_ITEM(__pyx_1, 1, __pyx_6);
=== modified file 'bzrlib/path_info_c.pyx'
--- a/bzrlib/path_info_c.pyx 2007-03-14 01:06:39 +0000
+++ b/bzrlib/path_info_c.pyx 2007-03-14 01:57:56 +0000
@@ -192,21 +192,12 @@
# TODO: could make this a constant to return, if we expect it to be
# common.
return (kind_missing, 0, False, 0, '')
+ # note: this can be dangerous, if the types do not correctly fit.
+ # pyrex makes the string a constant array, which stops gcc analysing this.
+ # should we file a bug on pyrex, or gcc ?
snprintf_result = snprintf(encoded, 96, "%lX.%lX.%lX.%lX.%lX.%lX",
st.st_size, st.st_mtime, st.st_ctime, st.st_dev, st.st_ino, st.st_mode)
statcachekey = encoded
- # result.append((fullname, a_stat.st_mode, a_stat.st_size, entry.d_ino))
- # base64.encode always adds a final newline, so strip it off
- #statcachekey = _encode(_pack('>llllll'
- # , st.st_size, int(st.st_mtime), int(st.st_ctime)
- # , st.st_dev, st.st_ino, st.st_mode))[:-1]
-
-## if fast_pack:
-## statcachekey = _fast__pack(st.st_size, int(st.st_mtime), int(st.st_ctime),
-## st.st_dev, st.st_ino, st.st_mode)
-## else:
-## statcachekey = _slow__pack(st.st_size, int(st.st_mtime), int(st.st_ctime),
-## st.st_dev, st.st_ino, st.st_mode)
if st.st_ctime < st.st_mtime:
recenttime = st.st_mtime
else:
More information about the bazaar-commits
mailing list