Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a20d5db

Browse files
committedMar 31, 2024
typos
1 parent 5d16396 commit a20d5db

18 files changed

+68
-69
lines changed
 

‎.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ repos:
33
rev: v1.16.26
44
hooks:
55
- id: typos
6-
# empty to do not write fixes
7-
# args: []
6+
args: [] # empty to do not write fixes
87
exclude: pyproject.toml
98

109
- repo: https://github.com/astral-sh/ruff-pre-commit

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ In the less common case that you do not want to install test dependencies, `pip
101101

102102
#### With editable *dependencies* (not preferred, and rarely needed)
103103

104-
In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediatley reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.
104+
In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediately reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.
105105

106106
If you want to do that *and* you want the versions in GitPython's git submodules to be used, then pass `-e git/ext/gitdb` and/or `-e git/ext/gitdb/gitdb/ext/smmap` to `pip install`. This can be done in any order, and in separate `pip install` commands or the same one, so long as `-e` appears before *each* path. For example, you can install GitPython, gitdb, and smmap editably in the currently active virtual environment this way:
107107

@@ -234,7 +234,7 @@ Please have a look at the [contributions file][contributing].
234234
- [Loki](https://github.com/Neo23x0/Loki)
235235
- [Omniwallet](https://github.com/OmniLayer/omniwallet)
236236
- [GitViper](https://github.com/BeayemX/GitViper)
237-
- [Git Gud](https://github.com/bthayer2365/git-gud)
237+
- [Git Good](https://github.com/bthayer2365/git-gud)
238238

239239
### LICENSE
240240

‎doc/source/changes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ https://github.com/gitpython-developers/GitPython/releases/tag/3.1.42
2020
3.1.41
2121
======
2222

23-
This release is relevant for security as it fixes a possible arbitary
23+
This release is relevant for security as it fixes a possible arbitrary
2424
code execution on Windows.
2525

2626
See this PR for details: https://github.com/gitpython-developers/GitPython/pull/1792

‎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, _conten_sha = read_cache(stream)
197+
self.version, self.entries, self._extension_data, _contain_sha = read_cache(stream)
198198
return self
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
for root, _dirs, files in os.walk(abs_path, onerror=raise_exc):
442-
for rela_file in files:
442+
for real_file in files:
443443
# Add relative paths only.
444-
yield osp.join(root.replace(rs, ""), rela_file)
444+
yield osp.join(root.replace(rs, ""), real_file)
445445
# END for each file in subdir
446446
# END for each subdirectory
447447
except OSError:
@@ -951,7 +951,7 @@ def handle_null_entries(self: "IndexFile") -> None:
951951

952952
return entries_added
953953

954-
def _items_to_rela_paths(
954+
def _items_to_real_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_rela_paths(items)
1028+
paths = self._items_to_real_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
if skip_errors:
10791079
args.append("-k")
10801080

1081-
paths = self._items_to_rela_paths(items)
1081+
paths = self._items_to_real_paths(items)
10821082
if len(paths) < 2:
10831083
raise ValueError("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-
rela_path = osp.relpath(module_abspath, start=working_tree_dir)
419+
real_path = osp.relpath(module_abspath, start=working_tree_dir)
420420
if sys.platform == "win32" and osp.isfile(git_file):
421421
os.remove(git_file)
422422
with open(git_file, "wb") as fp:
423-
fp.write(("gitdir: %s" % rela_path).encode(defenc))
423+
fp.write(("gitdir: %s" % real_path).encode(defenc))
424424

425425
with GitConfigParser(osp.join(module_abspath, "config"), read_only=False, merge_includes=False) as writer:
426426
writer.set_value(

‎git/objects/util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,11 +568,11 @@ def addToStack(
568568
yield rval
569569

570570
# Only continue to next level if this is appropriate!
571-
nd = d + 1
572-
if depth > -1 and nd > depth:
571+
nb = d + 1
572+
if depth > -1 and nb > depth:
573573
continue
574574

575-
addToStack(stack, item, branch_first, nd)
575+
addToStack(stack, item, branch_first, nb)
576576
# END for each item on work stack
577577

578578

‎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-
# commit 111ef79afe, after tag v2.15.0-rc1
137+
# commit 111ef79safe, after tag v2.15.0-rc1
138138
# from repo https://github.com/git/git.git
139139
if line.startswith("# pack-refs with:") and "peeled" not in line:
140140
raise TypeError("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 at rela_path points to if available, or ``None``.
229+
* *sha* is of the file at real_path points to if available, or ``None``.
230230
* *target_ref_path* is the reference we point to, or ``None``.
231231
"""
232232
if ref_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 at rela_path points to if available, or ``None``.
275+
* *sha* is of the file at real_path points to if available, or ``None``.
276276
* *target_ref_path* is the reference we point to, or ``None``.
277277
"""
278278
return cls._get_ref_info_helper(repo, ref_path)
@@ -813,7 +813,7 @@ def _iter_items(
813813
) -> Iterator[T_References]:
814814
if common_path is None:
815815
common_path = cls._common_path_default
816-
rela_paths = set()
816+
real_paths = set()
817817

818818
# Walk loose refs.
819819
# Currently we do not follow links.
@@ -828,19 +828,19 @@ def _iter_items(
828828
if f == "packed-refs":
829829
continue
830830
abs_path = to_native_path_linux(join_path(root, f))
831-
rela_paths.add(abs_path.replace(to_native_path_linux(repo.common_dir) + "/", ""))
831+
real_paths.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, rela_path in cls._iter_packed_refs(repo):
837-
if rela_path.startswith(str(common_path)):
838-
rela_paths.add(rela_path)
836+
for _sha, real_path in cls._iter_packed_refs(repo):
837+
if real_path.startswith(str(common_path)):
838+
real_paths.add(real_path)
839839
# END relative path matches common path
840840
# END packed refs reading
841841

842842
# Yield paths in sorted order.
843-
for path in sorted(rela_paths):
843+
for path in sorted(real_paths):
844844
try:
845845
yield cls.from_path(repo, path)
846846
except ValueError:

‎git/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ def _parse_progress_line(self, line: AnyStr) -> None:
652652
op_code |= self.CHECKING_OUT
653653
else:
654654
# Note: On Windows it can happen that partial lines are sent.
655-
# Hence we get something like "CompreReceiving objects", which is
655+
# Hence we get something like "CompareReceiving objects", which is
656656
# a blend of "Compressing objects" and "Receiving objects".
657657
# This can't really be prevented, so we drop the line verbosely
658658
# to make sure we get informed in case the process spits out new

‎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-
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaNd
16+
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaAnd
1717
XMNvSK8IZtWLkx7k3A3QYt1cN4y1zdSHLR2S+BVCEJea1mvUE+jK5wiB9S4XNtKm
1818
BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
1919
JzJMZDRLQLFvnzqZuCjE

‎test/fixtures/diff_mode_only

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ index d873924860bf4da06ac93db5c6a188f63dd1c3cc..57da75f05e28e8a256922bf345ccd390
260260
+ # :text:: to_text, text/plain
261261
+ # :html:: to_html, text/html or application/xhtml+xml or application/html
262262
+ # :xml:: to_xml, application/xml or text/xml or application/x-xml, adds "Encoding: UTF-8" response header
263-
+ # :js:: to_json, text/javascript ot application/javascript or application/x-javascript
263+
+ # :js:: to_json, text/javascript to application/javascript or application/x-javascript
264264
+ # :json:: to_json, application/json or text/x-json
265265
+ Merb.available_mime_types.clear
266266
+ Merb.add_mime_type(:all, nil, %w[*/*])
@@ -415,7 +415,7 @@ index d17570786ca318cff7201c4b1e947ae229b01de8..ff9abe4d1c452aeabfcf5f7dc7a2c7cd
415415

416416
# Any specific outgoing headers should be included here. These are not
417417
# the content-type header but anything in addition to it.
418-
- # +tranform_method+ should be set to a symbol of the method used to
418+
- # +transform_method+ should be set to a symbol of the method used to
419419
+ # +transform_method+ should be set to a symbol of the method used to
420420
# transform a resource into this mime type.
421421
# For example for the :xml mime type an object might be transformed by
@@ -433,7 +433,7 @@ index d17570786ca318cff7201c4b1e947ae229b01de8..ff9abe4d1c452aeabfcf5f7dc7a2c7cd
433433
- # :text:: to_text, text/plain
434434
- # :html:: to_html, text/html or application/xhtml+xml or application/html
435435
- # :xml:: to_xml, application/xml or text/xml or application/x-xml, adds "Encoding: UTF-8" response header
436-
- # :js:: to_json, text/javascript ot application/javascript or application/x-javascript
436+
- # :js:: to_json, text/javascript to application/javascript or application/x-javascript
437437
- # :json:: to_json, application/json or text/x-json
438438
- def reset_default_mime_types!
439439
- available_mime_types.clear
@@ -509,15 +509,15 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
509509
- # ==== Returns
510510
- # The current list of formats provided for this instance of the controller.
511511
- # It starts with what has been set in the controller (or :html by default)
512-
- # but can be modifed on a per-action basis.
512+
- # but can be modified on a per-action basis.
513513
- def _provided_formats
514514
- @_provided_formats ||= class_provided_formats.dup
515515
+ end
516516
+
517517
+ # ==== Returns
518518
+ # The current list of formats provided for this instance of the controller.
519519
+ # It starts with what has been set in the controller (or :html by default)
520-
+ # but can be modifed on a per-action basis.
520+
+ # but can be modified on a per-action basis.
521521
+ def _provided_formats
522522
+ @_provided_formats ||= class_provided_formats.dup
523523
+ end
@@ -531,7 +531,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
531531
+ #
532532
+ # ==== Raises
533533
+ # Merb::ResponderMixin::ContentTypeAlreadySet::
534-
+ # Content negotiation already occured, and the content_type is set.
534+
+ # Content negotiation already occurred, and the content_type is set.
535535
+ #
536536
+ # ==== Returns
537537
+ # Array:: List of formats passed in
@@ -549,7 +549,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
549549
- #
550550
- # ==== Raises
551551
- # Merb::ResponderMixin::ContentTypeAlreadySet::
552-
- # Content negotiation already occured, and the content_type is set.
552+
- # Content negotiation already occurred, and the content_type is set.
553553
- #
554554
- # ==== Returns
555555
- # Array:: List of formats passed in
@@ -574,7 +574,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
574574
+ #
575575
+ # ==== Raises
576576
+ # Merb::ResponderMixin::ContentTypeAlreadySet::
577-
+ # Content negotiation already occured, and the content_type is set.
577+
+ # Content negotiation already occurred, and the content_type is set.
578578
+ #
579579
+ # ==== Returns
580580
+ # Array:: List of formats passed in
@@ -597,7 +597,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
597597
- #
598598
- # ==== Raises
599599
- # Merb::ResponderMixin::ContentTypeAlreadySet::
600-
- # Content negotiation already occured, and the content_type is set.
600+
- # Content negotiation already occurred, and the content_type is set.
601601
- #
602602
- # ==== Returns
603603
- # Array:: List of formats passed in

‎test/fixtures/reflog_HEAD

Lines changed: 15 additions & 15 deletions
Large diffs are not rendered by default.

‎test/fixtures/reflog_master

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
501bf602abea7d21c3dbb409b435976e92033145 82b8902e033430000481eb355733cd7065342037 Sebastian Thiel <byronimo@gmail.com> 1270634931 +0200 commit: Used this release for a first beta of the 0.2 branch of development
22
82b8902e033430000481eb355733cd7065342037 69361d96a59381fde0ac34d19df2d4aff05fb9a9 Sebastian Thiel <byronimo@gmail.com> 1271229940 +0200 commit: conf.py: Adjusted version to match with the actual version
33
69361d96a59381fde0ac34d19df2d4aff05fb9a9 0d6ceabf5b90e7c0690360fc30774d36644f563c Sebastian Thiel <byronimo@gmail.com> 1272614247 +0200 merge integration: Fast-forward
4-
22a0289972b365b7912340501b52ca3dd98be289 143b927307d46ccb8f1cc095739e9625c03c82ff Sebastian Thiel <byronimo@gmail.com> 1272988814 +0200 commit: TODO: Removed all entries but left a mesage about where to find the issuee on lighthouse.
4+
22a0289972b365b7912340501b52ca3dd98be289 143b927307d46ccb8f1cc095739e9625c03c82ff Sebastian Thiel <byronimo@gmail.com> 1272988814 +0200 commit: TODO: Removed all entries but left a message about where to find the issuee on lighthouse.
55
143b927307d46ccb8f1cc095739e9625c03c82ff e41c727be8dbf8f663e67624b109d9f8b135a4ab Sebastian Thiel <byronimo@gmail.com> 1273140152 +0200 commit: README: Added mailing list and issue tracker information
66
c083f3d0b853e723d0d4b00ff2f1ec5f65f05cba de5bc8f7076c5736ef1efa57345564fbc563bd19 Sebastian Thiel <byronimo@gmail.com> 1273522570 +0200 commit: Handle filenames with embedded spaces when generating diffs
77
de5bc8f7076c5736ef1efa57345564fbc563bd19 8caeec1b15645fa53ec5ddc6e990e7030ffb7c5a Sebastian Thiel <byronimo@gmail.com> 1273529174 +0200 commit: IndexFile.add: Fixed incorrect path handling if path rewriting was desired and absolute paths were given
88
600fcbc1a2d723f8d51e5f5ab6d9e4c389010e1c 1019d4cf68d1acdbb4d6c1abb7e71ac9c0f581af Sebastian Thiel <byronimo@gmail.com> 1274811103 +0200 commit: diff: by limiting the splitcount to 5, a subtle bug was introduced as the newline at the end of the split line was not split away automatically. Added test for this, and the trivial fix
9-
1019d4cf68d1acdbb4d6c1abb7e71ac9c0f581af 17af1f64d5f1e62d40e11b75b1dd48e843748b49 Sebastian Thiel <byronimo@gmail.com> 1274877948 +0200 commit: BlockingLockFile: added sanity check that raises IOError if the directory containing the lock was removed. This is unlikely to happen in a production envrironment, but may happen during testing, as folders are moved/deleted once the test is complete. Daemons might still be waiting for something, and they should be allowed to terminate instead of waiting for a possibly long time
9+
1019d4cf68d1acdbb4d6c1abb7e71ac9c0f581af 17af1f64d5f1e62d40e11b75b1dd48e843748b49 Sebastian Thiel <byronimo@gmail.com> 1274877948 +0200 commit: BlockingLockFile: added sanity check that raises IOError if the directory containing the lock was removed. This is unlikely to happen in a production environment, but may happen during testing, as folders are moved/deleted once the test is complete. Daemons might still be waiting for something, and they should be allowed to terminate instead of waiting for a possibly long time
1010
17af1f64d5f1e62d40e11b75b1dd48e843748b49 34ba8ffba0b3b4d21da7bcea594cc3631e422142 Sebastian Thiel <byronimo@gmail.com> 1274906080 +0200 commit: refs: a Reference can now be created by assigning a commit or object (for convenience)
1111
34ba8ffba0b3b4d21da7bcea594cc3631e422142 11dc82538cc1ebb537c866c8e76146e384cdfe24 Sebastian Thiel <byronimo@gmail.com> 1274906333 +0200 commit: refs: a Reference can now be created by assigning a commit or object (for convenience)
1212
11dc82538cc1ebb537c866c8e76146e384cdfe24 34ba8ffba0b3b4d21da7bcea594cc3631e422142 Sebastian Thiel <byronimo@gmail.com> 1274906338 +0200 HEAD~1: updating HEAD
@@ -58,14 +58,14 @@ feb1ea0f4aacb9ea6dc4133900e65bf34c0ee02d 402a6c2808db4333217aa300d0312836fd7923b
5858
f1401803ccf7db5d897a5ef4b27e2176627c430e 6917ae4ce9eaa0f5ea91592988c1ea830626ac3a Sebastian Thiel <byronimo@gmail.com> 1277806256 +0200 commit: Diff: fixed bug that caused a string to end up as a blob mode
5959
6917ae4ce9eaa0f5ea91592988c1ea830626ac3a fd96cceded27d1372bdc1a851448d2d8613f60f3 Sebastian Thiel <byronimo@gmail.com> 1277999899 +0200 merge docs: Merge made by recursive.
6060
fd96cceded27d1372bdc1a851448d2d8613f60f3 f683c6623f73252645bb2819673046c9d397c567 Sebastian Thiel <byronimo@gmail.com> 1278082451 +0200 commit: Fixed broken 0.2 documentation, it didn't contain the API reference previously due to import errors and a somewhat inconsistent working tree that occurred when switching branches ...
61-
f683c6623f73252645bb2819673046c9d397c567 a4287f65878000b42d11704692f9ea3734014b4c Sebastian Thiel <byronimo@gmail.com> 1278092317 +0200 commit: win32 compatability adjustments
61+
f683c6623f73252645bb2819673046c9d397c567 a4287f65878000b42d11704692f9ea3734014b4c Sebastian Thiel <byronimo@gmail.com> 1278092317 +0200 commit: win32 compatibility adjustments
6262
a4287f65878000b42d11704692f9ea3734014b4c ca288d443f4fc9d790eecb6e1cdf82b6cdd8dc0d Sebastian Thiel <byronimo@gmail.com> 1278517416 +0200 merge revparse: Merge made by recursive.
6363
ca288d443f4fc9d790eecb6e1cdf82b6cdd8dc0d 5fd6cc37fd07c25cb921b77b4f658b7e8fc132b3 Sebastian Thiel <byronimo@gmail.com> 1278536545 +0200 commit: Adjusted clone method to allow static classmethod clone ( using clone_from ) as well as the previous instance method clone to keep it compatible
6464
5fd6cc37fd07c25cb921b77b4f658b7e8fc132b3 76af62b3c5a26638fcad9a3fe401fba566fb7037 Sebastian Thiel <byronimo@gmail.com> 1278538933 +0200 commit (amend): Adjusted clone method to allow static classmethod clone ( using clone_from ) as well as the previous instance method clone to keep it compatible
6565
76af62b3c5a26638fcad9a3fe401fba566fb7037 b425301ad16f265157abdaf47f7af1c1ea879068 Sebastian Thiel <byronimo@gmail.com> 1278539147 +0200 commit (amend): Adjusted clone method to allow static classmethod clone ( using clone_from ) as well as the previous instance method clone to keep it compatible
6666
b425301ad16f265157abdaf47f7af1c1ea879068 3288a244428751208394d8137437878277ceb71f Sebastian Thiel <byronimo@gmail.com> 1278582561 +0200 commit: setup.py: fixed requirement - its interesting to see that there are two different keywords for distutils and setuptools, the latter one doesn't read the ones of the first one, unfortunately
6767
3288a244428751208394d8137437878277ceb71f 08457a7a6b6ad4f518fad0d5bca094a2b5b38fbe Sebastian Thiel <byronimo@gmail.com> 1278670718 +0200 commit: Added python 2.4 support: Repo will now use the original GitCmdObjectDB in python 2.4, as the pure python implementation cannot work without memory maps
68-
08457a7a6b6ad4f518fad0d5bca094a2b5b38fbe 258403da9c2a087b10082d26466528fce3de38d4 Sebastian Thiel <byronimo@gmail.com> 1278671744 +0200 commit: bumped verison to 0.3.0 beta2
68+
08457a7a6b6ad4f518fad0d5bca094a2b5b38fbe 258403da9c2a087b10082d26466528fce3de38d4 Sebastian Thiel <byronimo@gmail.com> 1278671744 +0200 commit: bumped version to 0.3.0 beta2
6969
258403da9c2a087b10082d26466528fce3de38d4 55b67e8194b8b4d9e73e27feadbf9af6593e4600 Sebastian Thiel <byronimo@gmail.com> 1278927490 +0200 pull gitorious master: Fast-forward
7070
55b67e8194b8b4d9e73e27feadbf9af6593e4600 bcd37b68533d0cceb7e73dd1ed1428fa09f7dc17 Sebastian Thiel <byronimo@gmail.com> 1279007300 +0200 commit: Fixed incorrect use of Blob.data in performance test
7171
bcd37b68533d0cceb7e73dd1ed1428fa09f7dc17 24740f22c59c3bcafa7b2c1f2ec997e4e14f3615 Sebastian Thiel <byronimo@gmail.com> 1279110447 +0200 commit: Added performance test to compare inst.__class__() vs type(inst)() class. The first one is faster, although I would have expected the latter one to be faster

‎test/lib/helper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,15 +386,15 @@ def tearDownClass(cls):
386386
cls.rorepo.git.clear_cache()
387387
cls.rorepo.git = None
388388

389-
def _make_file(self, rela_path, data, repo=None):
389+
def _make_file(self, real_path, data, repo=None):
390390
"""
391391
Create a file at the given path relative to our repository, filled with the
392392
given data.
393393
394394
:return: An absolute path to the created file.
395395
"""
396396
repo = repo or self.rorepo
397-
abs_path = osp.join(repo.working_tree_dir, rela_path)
397+
abs_path = osp.join(repo.working_tree_dir, real_path)
398398
with open(abs_path, "w") as fp:
399399
fp.write(data)
400400
return abs_path

‎test/test_commit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ def test_gpgsig(self):
414414
Tack6sxIdK7NXJhV5gAeAOMJBGhO0fHl8UUr96vGEKwtxyZhWf8cuIPOWLk06jA0
415415
g9DpLqmy/pvyRfiPci+24YdYRBua/vta+yo/Lp85N7Hu/cpIh+q5WSLvUlv09Dmo
416416
TTTG8Hf6s3lEej7W8z2xcNZoB6GwXd8buSDU8cu0I6mEO9sNtAuUOHp2dBvTA6cX
417-
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaNd
417+
PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaAnd
418418
XMNvSK8IZtWLkx7k3A3QYt1cN4y1zdSHLR2S+BVCEJea1mvUE+jK5wiB9S4XNtKm
419419
BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
420420
JzJMZDRLQLFvnzqZuCjE

‎test/test_exc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
_streams_n_substrings = (
5454
None,
55-
"steram",
55+
"stream",
5656
"ομορφο stream",
5757
)
5858

‎test/test_index.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ class Mocked:
10181018
@pytest.mark.xfail(
10191019
type(_win_bash_status) is WinBashStatus.Absent,
10201020
reason="Can't run a hook on Windows without bash.exe.",
1021-
rasies=HookExecutionError,
1021+
raises=HookExecutionError,
10221022
)
10231023
@pytest.mark.xfail(
10241024
type(_win_bash_status) is WinBashStatus.WslNoDistro,
@@ -1077,7 +1077,7 @@ def test_hook_uses_shell_not_from_cwd(self, rw_dir, case):
10771077
@pytest.mark.xfail(
10781078
type(_win_bash_status) is WinBashStatus.Absent,
10791079
reason="Can't run a hook on Windows without bash.exe.",
1080-
rasies=HookExecutionError,
1080+
raises=HookExecutionError,
10811081
)
10821082
@pytest.mark.xfail(
10831083
type(_win_bash_status) is WinBashStatus.WslNoDistro,
@@ -1120,7 +1120,7 @@ def test_pre_commit_hook_fail(self, rw_repo):
11201120
@pytest.mark.xfail(
11211121
type(_win_bash_status) is WinBashStatus.Absent,
11221122
reason="Can't run a hook on Windows without bash.exe.",
1123-
rasies=HookExecutionError,
1123+
raises=HookExecutionError,
11241124
)
11251125
@pytest.mark.xfail(
11261126
type(_win_bash_status) is WinBashStatus.Wsl,

‎test/test_refs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TestRefs(TestBase):
3232
def test_from_path(self):
3333
# Should be able to create any reference directly.
3434
for ref_type in (Reference, Head, TagReference, RemoteReference):
35-
for name in ("rela_name", "path/rela_name"):
35+
for name in ("real_name", "path/rela_name"):
3636
full_path = ref_type.to_full_path(name)
3737
instance = ref_type.from_path(self.rorepo, full_path)
3838
assert isinstance(instance, ref_type)
@@ -454,7 +454,7 @@ def test_head_reset(self, rw_repo):
454454

455455
# Rename it.
456456
orig_obj = ref.object
457-
for name in ("refs/absname", "rela_name", "feature/rela_name"):
457+
for name in ("refs/absname", "real_name", "feature/rela_name"):
458458
ref_new_name = ref.rename(name)
459459
assert isinstance(ref_new_name, Reference)
460460
assert name in ref_new_name.path

‎test/test_repo.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,11 @@ def write(self, b):
519519

520520
def test_init(self):
521521
with tempfile.TemporaryDirectory() as tdir, cwd(tdir):
522-
git_dir_rela = "repos/foo/bar.git"
523-
git_dir_abs = osp.abspath(git_dir_rela)
522+
git_dir_real = "repos/foo/bar.git"
523+
git_dir_abs = osp.abspath(git_dir_real)
524524

525525
# With specific path
526-
for path in (git_dir_rela, git_dir_abs):
526+
for path in (git_dir_real, git_dir_abs):
527527
r = Repo.init(path=path, bare=True)
528528
self.assertIsInstance(r, Repo)
529529
assert r.bare is True
@@ -560,8 +560,8 @@ def test_init(self):
560560

561561
# END for each path
562562

563-
os.makedirs(git_dir_rela)
564-
os.chdir(git_dir_rela)
563+
os.makedirs(git_dir_real)
564+
os.chdir(git_dir_real)
565565
r = Repo.init(bare=False)
566566
assert r.bare is False
567567
assert not r.has_separate_working_tree()

0 commit comments

Comments
 (0)
Please sign in to comment.