Mercurial > hg
annotate mercurial/cext/osutil.pyi @ 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 | 8dca9051a859 |
children | c6a3243567b6 |
rev | line source |
---|---|
46038
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 from typing import ( |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 AnyStr, |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
3 IO, |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
4 List, |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
5 Sequence, |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
6 ) |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
7 |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
8 version: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
9 |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
10 class stat: |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
11 st_dev: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
12 st_mode: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
13 st_nlink: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
14 st_size: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
15 st_mtime: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
16 st_ctime: int |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
17 |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
18 def listdir(path: bytes, st: bool, skip: bool) -> List[stat]: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
19 def posixfile(name: AnyStr, mode: bytes, buffering: int) -> IO: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
20 def statfiles(names: Sequence[bytes]) -> List[stat]: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
21 def recvfds(sockfd: int) -> List[int]: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
22 def setprocname(name: bytes) -> None: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
23 def getfstype(path: bytes) -> bytes: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
24 def getfsmountpoint(path: bytes) -> bytes: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
25 def unblocksignal(sig: int) -> None: ... |
8dca9051a859
cext: add .pyi files for C extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
26 def isgui() -> bool: ... |