Mercurial > hg
annotate mercurial/cext/revlog.h @ 48976:877d7e1a4223 stable
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Mar 2022 21:15:54 -0700 |
parents | 9db11679f8ac |
children |
rev | line source |
---|---|
40859
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
1 /* |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
2 revlog.h - efficient revlog parsing |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
3 |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
4 This software may be used and distributed according to the terms of |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
5 the GNU General Public License, incorporated herein by reference. |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
6 */ |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
7 |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
8 #ifndef _HG_REVLOG_H_ |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
9 #define _HG_REVLOG_H_ |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
10 |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
11 #include <Python.h> |
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
12 |
40860
18a8def6e1b5
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol
Yuya Nishihara <yuya@tcha.org>
parents:
40859
diff
changeset
|
13 extern PyTypeObject HgRevlogIndex_Type; |
40859
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
14 |
40861
b12700dd261f
revlog: add public CPython function to get parent revisions
Yuya Nishihara <yuya@tcha.org>
parents:
40860
diff
changeset
|
15 #define HgRevlogIndex_Check(op) PyObject_TypeCheck(op, &HgRevlogIndex_Type) |
b12700dd261f
revlog: add public CPython function to get parent revisions
Yuya Nishihara <yuya@tcha.org>
parents:
40860
diff
changeset
|
16 |
40859
aa76be85029b
revlog: export symbol of indexType
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
17 #endif /* _HG_REVLOG_H_ */ |