Merge lp:~jelmer/brz/ancient-time into lp:brz/3.0

Proposed by Jelmer Vernooij on 2020-01-23
Status: Merged
Approved by: Jelmer Vernooij on 2020-01-23
Approved revision: 7337
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/ancient-time
Merge into: lp:brz/3.0
Diff against target: 28 lines (+4/-3)
2 files modified
breezy/bzr/_dirstate_helpers_pyx.pyx (+1/-3)
doc/en/release-notes/brz-3.0.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/ancient-time
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve on 2020-01-23
Review via email: mp+377980@code.launchpad.net

Commit message

Fix conversion of time_t to int on certain platforms.

Description of the change

Fix conversion of time_t to int on certain platforms.

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/_dirstate_helpers_pyx.pyx'
2--- breezy/bzr/_dirstate_helpers_pyx.pyx 2019-11-18 06:20:31 +0000
3+++ breezy/bzr/_dirstate_helpers_pyx.pyx 2020-01-23 03:26:48 +0000
4@@ -797,10 +797,8 @@
5
6
7 cdef unsigned long _time_to_unsigned(object t): # cannot_raise
8- cdef double dt
9 if PyFloat_Check(t):
10- dt = PyFloat_AsDouble(t)
11- return <unsigned long>dt
12+ t = t.__int__()
13 return PyInt_AsUnsignedLongMask(t)
14
15
16
17=== modified file 'doc/en/release-notes/brz-3.0.txt'
18--- doc/en/release-notes/brz-3.0.txt 2019-12-23 03:05:20 +0000
19+++ doc/en/release-notes/brz-3.0.txt 2020-01-23 03:26:48 +0000
20@@ -40,6 +40,9 @@
21 * Don't rely on private transport attribute in fast-import.
22 (Jelmer Vernooń≥, #1854607)
23
24+ * Fix conversion of time_t to int on certain platforms (arm64, armhf,
25+ ppc64el). (Jelmer Vernooń≥)
26+
27 Documentation
28 *************
29

Subscribers

People subscribed via source and target branches