Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf913b57

Browse files
committed
manual fixing
1 parenta20d5db commitf913b57

File tree

11 files changed

+48
-48
lines changed

11 files changed

+48
-48
lines changed

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
-repo:https://github.com/crate-ci/typos
3-
rev:v1.16.26
3+
rev:v1.19.0
44
hooks:
55
-id:typos
66
args:[]# empty to do not write fixes

‎git/index/base.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def _delete_entries_cache(self) -> None:
194194

195195
def_deserialize(self,stream:IO)->"IndexFile":
196196
"""Initialize this instance with index values read from the given stream."""
197-
self.version,self.entries,self._extension_data,_contain_sha=read_cache(stream)
197+
self.version,self.entries,self._extension_data,_content_sha=read_cache(stream)
198198
returnself
199199

200200
def_entries_sorted(self)->List[IndexEntry]:
@@ -439,9 +439,9 @@ def raise_exc(e: Exception) -> NoReturn:
439439
# END glob handling
440440
try:
441441
forroot,_dirs,filesinos.walk(abs_path,onerror=raise_exc):
442-
forreal_fileinfiles:
442+
forrelative_fpathinfiles:
443443
# Add relative paths only.
444-
yieldosp.join(root.replace(rs,""),real_file)
444+
yieldosp.join(root.replace(rs,""),relative_fpath)
445445
# END for each file in subdir
446446
# END for each subdirectory
447447
exceptOSError:
@@ -951,7 +951,7 @@ def handle_null_entries(self: "IndexFile") -> None:
951951

952952
returnentries_added
953953

954-
def_items_to_real_paths(
954+
def_items_to_relative_paths(
955955
self,
956956
items:Union[PathLike,Sequence[Union[PathLike,BaseIndexEntry,Blob,Submodule]]],
957957
)->List[PathLike]:
@@ -1025,7 +1025,7 @@ def remove(
10251025
args.append("--")
10261026

10271027
# Preprocess paths.
1028-
paths=self._items_to_real_paths(items)
1028+
paths=self._items_to_relative_paths(items)
10291029
removed_paths=self.repo.git.rm(args,paths,**kwargs).splitlines()
10301030

10311031
# Process output to gain proper paths.
@@ -1078,7 +1078,7 @@ def move(
10781078
ifskip_errors:
10791079
args.append("-k")
10801080

1081-
paths=self._items_to_real_paths(items)
1081+
paths=self._items_to_relative_paths(items)
10821082
iflen(paths)<2:
10831083
raiseValueError("Please provide at least one source and one destination of the move operation")
10841084

‎git/objects/submodule/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,11 @@ def _write_git_file_and_module_config(cls, working_tree_dir: PathLike, module_ab
416416
Absolute path to the bare repository.
417417
"""
418418
git_file=osp.join(working_tree_dir,".git")
419-
real_path=osp.relpath(module_abspath,start=working_tree_dir)
419+
relative_fpath=osp.relpath(module_abspath,start=working_tree_dir)
420420
ifsys.platform=="win32"andosp.isfile(git_file):
421421
os.remove(git_file)
422422
withopen(git_file,"wb")asfp:
423-
fp.write(("gitdir: %s"%real_path).encode(defenc))
423+
fp.write(("gitdir: %s"%relative_fpath).encode(defenc))
424424

425425
withGitConfigParser(osp.join(module_abspath,"config"),read_only=False,merge_includes=False)aswriter:
426426
writer.set_value(

‎git/refs/symbolic.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def _iter_packed_refs(cls, repo: "Repo") -> Iterator[Tuple[str, str]]:
134134
# that can go on this line, as per comments in git file
135135
# refs/packed-backend.c
136136
# I looked at master on 2017-10-11,
137-
# commit111ef79safe, after tag v2.15.0-rc1
137+
# commit111ef79afe, after tag v2.15.0-rc1
138138
# from repo https://github.com/git/git.git
139139
ifline.startswith("# pack-refs with:")and"peeled"notinline:
140140
raiseTypeError("PackingType of packed-Refs not understood: %r"%line)
@@ -226,7 +226,7 @@ def _get_ref_info_helper(
226226
:return:
227227
*(str(sha), str(target_ref_path))*, where:
228228
229-
* *sha* is of the file atreal_path points to if available, or ``None``.
229+
* *sha* is of the file atrelative_fpath points to if available, or ``None``.
230230
* *target_ref_path* is the reference we point to, or ``None``.
231231
"""
232232
ifref_path:
@@ -272,7 +272,7 @@ def _get_ref_info(cls, repo: "Repo", ref_path: Union[PathLike, None]) -> Union[T
272272
:return:
273273
*(str(sha), str(target_ref_path))*, where:
274274
275-
* *sha* is of the file atreal_path points to if available, or ``None``.
275+
* *sha* is of the file atrelative_fpath points to if available, or ``None``.
276276
* *target_ref_path* is the reference we point to, or ``None``.
277277
"""
278278
returncls._get_ref_info_helper(repo,ref_path)
@@ -813,7 +813,7 @@ def _iter_items(
813813
)->Iterator[T_References]:
814814
ifcommon_pathisNone:
815815
common_path=cls._common_path_default
816-
real_paths=set()
816+
relative_fpaths=set()
817817

818818
# Walk loose refs.
819819
# Currently we do not follow links.
@@ -828,19 +828,19 @@ def _iter_items(
828828
iff=="packed-refs":
829829
continue
830830
abs_path=to_native_path_linux(join_path(root,f))
831-
real_paths.add(abs_path.replace(to_native_path_linux(repo.common_dir)+"/",""))
831+
relative_fpaths.add(abs_path.replace(to_native_path_linux(repo.common_dir)+"/",""))
832832
# END for each file in root directory
833833
# END for each directory to walk
834834

835835
# Read packed refs.
836-
for_sha,real_pathincls._iter_packed_refs(repo):
837-
ifreal_path.startswith(str(common_path)):
838-
real_paths.add(real_path)
836+
for_sha,relative_fpathincls._iter_packed_refs(repo):
837+
ifrelative_fpath.startswith(str(common_path)):
838+
relative_fpaths.add(relative_fpath)
839839
# END relative path matches common path
840840
# END packed refs reading
841841

842842
# Yield paths in sorted order.
843-
forpathinsorted(real_paths):
843+
forpathinsorted(relative_fpaths):
844844
try:
845845
yieldcls.from_path(repo,path)
846846
exceptValueError:

‎test/fixtures/commit_with_gpgsig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gpgsig -----BEGIN PGP SIGNATURE-----
1313
Tack6sxIdK7NXJhV5gAeAOMJBGhO0fHl8UUr96vGEKwtxyZhWf8cuIPOWLk06jA0
1414
g9DpLqmy/pvyRfiPci+24YdYRBua/vta+yo/Lp85N7Hu/cpIh+q5WSLvUlv09Dmo
1515
TTTG8Hf6s3lEej7W8z2xcNZoB6GwXd8buSDU8cu0I6mEO9sNtAuUOHp2dBvTA6cX
16-
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaAnd
16+
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaNd
1717
XMNvSK8IZtWLkx7k3A3QYt1cN4y1zdSHLR2S+BVCEJea1mvUE+jK5wiB9S4XNtKm
1818
BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
1919
JzJMZDRLQLFvnzqZuCjE

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp