Show More
@@ -307,7 +307,6 b' static PyObject *pack_dirstate(PyObject ' | |||||
307 | Py_ssize_t len, l; |
|
307 | Py_ssize_t len, l; | |
308 | PyObject *o; |
|
308 | PyObject *o; | |
309 | char *s, *t; |
|
309 | char *s, *t; | |
310 | int err; |
|
|||
311 |
|
310 | |||
312 | if (!PyTuple_Check(v) || PyTuple_GET_SIZE(v) != 4) { |
|
311 | if (!PyTuple_Check(v) || PyTuple_GET_SIZE(v) != 4) { | |
313 | PyErr_SetString(PyExc_TypeError, "expected a 4-tuple"); |
|
312 | PyErr_SetString(PyExc_TypeError, "expected a 4-tuple"); | |
@@ -319,10 +318,11 b' static PyObject *pack_dirstate(PyObject ' | |||||
319 | goto bail; |
|
318 | goto bail; | |
320 | } |
|
319 | } | |
321 | *p++ = *s; |
|
320 | *p++ = *s; | |
322 |
|
|
321 | if (getintat(v, 1, &mode) == -1) | |
323 | err |= getintat(v, 2, &size); |
|
322 | goto bail; | |
324 |
|
|
323 | if (getintat(v, 2, &size) == -1) | |
325 | if (err) |
|
324 | goto bail; | |
|
325 | if (getintat(v, 3, &mtime) == -1) | |||
326 | goto bail; |
|
326 | goto bail; | |
327 | if (*s == 'n' && mtime == (uint32_t)now) { |
|
327 | if (*s == 'n' && mtime == (uint32_t)now) { | |
328 | /* See dirstate.py:write for why we do this. */ |
|
328 | /* See dirstate.py:write for why we do this. */ |
General Comments 0
You need to be logged in to leave comments.
Login now