← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_py.py

Merge fix for overflow issues in pack_stat from 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_py.py
34
34
    However, using the pyrex version instead is a bigger win.
35
35
    """
36
36
    # base64 encoding always adds a final newline, so strip it off
37
 
    return _b64(_pack(st.st_size, int(st.st_mtime), int(st.st_ctime),
38
 
        st.st_dev, st.st_ino & 0xFFFFFFFF, st.st_mode))[:-1]
 
37
    return _b64(_pack(st.st_size & 0xFFFFFFFF, int(st.st_mtime) & 0xFFFFFFFF,
 
38
        int(st.st_ctime) & 0xFFFFFFFF, st.st_dev & 0xFFFFFFFF,
 
39
        st.st_ino & 0xFFFFFFFF, st.st_mode))[:-1]
39
40
 
40
41
 
41
42
def _unpack_stat(packed_stat):