D3538: bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885)

2018-05-13 Thread jcristau (Julien Cristau) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG273ea09f6550: bdiff: fix yet more fallout from xdiff 
long/int64 conversion (issue5885) (authored by jcristau, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3538?vs=8658=8679

REVISION DETAIL
  https://phab.mercurial-scm.org/D3538

AFFECTED FILES
  mercurial/cext/bdiff.c

CHANGE DETAILS

diff --git a/mercurial/cext/bdiff.c b/mercurial/cext/bdiff.c
--- a/mercurial/cext/bdiff.c
+++ b/mercurial/cext/bdiff.c
@@ -261,7 +261,7 @@
  void *priv)
 {
PyObject *rl = (PyObject *)priv;
-   PyObject *m = Py_BuildValue("", a1, a2, b1, b2);
+   PyObject *m = Py_BuildValue("", a1, a2, b1, b2);
if (!m)
return -1;
if (PyList_Append(rl, m) != 0) {



To: jcristau, #hg-reviewers, quark, durin42
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D3538: bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885)

2018-05-13 Thread durin42 (Augie Fackler) 
durin42 added a comment.


  queued for stable, many thanks

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3538

To: jcristau, #hg-reviewers, quark, durin42
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D3538: bdiff: fix yet more fallout from xdiff long/int64 conversion (issue5885)

2018-05-12 Thread jcristau (Julien Cristau) 
jcristau created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  "l" in Py_BuildValue's format string means long, so passing int64_t
  instead results in fireworks on 32bit architectures.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3538

AFFECTED FILES
  mercurial/cext/bdiff.c

CHANGE DETAILS

diff --git a/mercurial/cext/bdiff.c b/mercurial/cext/bdiff.c
--- a/mercurial/cext/bdiff.c
+++ b/mercurial/cext/bdiff.c
@@ -261,7 +261,7 @@
  void *priv)
 {
PyObject *rl = (PyObject *)priv;
-   PyObject *m = Py_BuildValue("", a1, a2, b1, b2);
+   PyObject *m = Py_BuildValue("", a1, a2, b1, b2);
if (!m)
return -1;
if (PyList_Append(rl, m) != 0) {



To: jcristau, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel