Commit b32ef65
committed
Improve order of imports and __all__ in git.repo submodules
1 parent b25dd7e commit b32ef65
2 files changed
Lines changed: 18 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,6 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | 6 | from __future__ import annotations | |
| 7 | 7 | ||
| 8 | + __all__ = ("Repo",) | ||
| 9 | + | ||
| 8 | 10 | import gc | |
| 9 | 11 | import logging | |
| 10 | 12 | import os | |
@@ -92,8 +94,6 @@ | |||
| 92 | 94 | ||
| 93 | 95 | _logger = logging.getLogger(__name__) | |
| 94 | 96 | ||
| 95 | - __all__ = ("Repo",) | ||
| 96 | - | ||
| 97 | 97 | ||
| 98 | 98 | class BlameEntry(NamedTuple): | |
| 99 | 99 | commit: Dict[str, Commit] | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,18 +5,31 @@ | |||
| 5 | 5 | ||
| 6 | 6 | from __future__ import annotations | |
| 7 | 7 | ||
| 8 | + __all__ = ( | ||
| 9 | + "rev_parse", | ||
| 10 | + "is_git_dir", | ||
| 11 | + "touch", | ||
| 12 | + "find_submodule_git_dir", | ||
| 13 | + "name_to_object", | ||
| 14 | + "short_to_long", | ||
| 15 | + "deref_tag", | ||
| 16 | + "to_commit", | ||
| 17 | + "find_worktree_git_dir", | ||
| 18 | + ) | ||
| 19 | + | ||
| 8 | 20 | import os | |
| 9 | 21 | import os.path as osp | |
| 10 | 22 | from pathlib import Path | |
| 11 | 23 | import stat | |
| 12 | 24 | from string import digits | |
| 13 | 25 | ||
| 26 | + from gitdb.exc import BadName, BadObject | ||
| 27 | + | ||
| 14 | 28 | from git.cmd import Git | |
| 15 | 29 | from git.exc import WorkTreeRepositoryUnsupported | |
| 16 | 30 | from git.objects import Object | |
| 17 | 31 | from git.refs import SymbolicReference | |
| 18 | - from git.util import hex_to_bin, bin_to_hex, cygpath | ||
| 19 | - from gitdb.exc import BadName, BadObject | ||
| 32 | + from git.util import cygpath, bin_to_hex, hex_to_bin | ||
| 20 | 33 | ||
| 21 | 34 | # Typing ---------------------------------------------------------------------- | |
| 22 | 35 | ||
@@ -29,22 +42,11 @@ | |||
| 29 | 42 | from git.objects import Commit, TagObject | |
| 30 | 43 | from git.refs.reference import Reference | |
| 31 | 44 | from git.refs.tag import Tag | |
| 45 | + | ||
| 32 | 46 | from .base import Repo | |
| 33 | 47 | ||
| 34 | 48 | # ---------------------------------------------------------------------------- | |
| 35 | 49 | ||
| 36 | - __all__ = ( | ||
| 37 | - "rev_parse", | ||
| 38 | - "is_git_dir", | ||
| 39 | - "touch", | ||
| 40 | - "find_submodule_git_dir", | ||
| 41 | - "name_to_object", | ||
| 42 | - "short_to_long", | ||
| 43 | - "deref_tag", | ||
| 44 | - "to_commit", | ||
| 45 | - "find_worktree_git_dir", | ||
| 46 | - ) | ||
| 47 | - | ||
| 48 | 50 | ||
| 49 | 51 | def touch(filename: str) -> str: | |
| 50 | 52 | with open(filename, "ab"): | |
0 commit comments