summaryrefslogtreecommitdiff
path: root/git/refs/log.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/refs/log.py')
-rw-r--r--git/refs/log.py36
1 files changed, 17 insertions, 19 deletions
diff --git a/git/refs/log.py b/git/refs/log.py
index 3078355d..bab6ae04 100644
--- a/git/refs/log.py
+++ b/git/refs/log.py
@@ -1,31 +1,29 @@
+import re
+import time
+
+from git.compat import (
+ PY3,
+ xrange,
+ string_types,
+ defenc
+)
+from git.objects.util import (
+ parse_date,
+ Serializable,
+ altz_to_utctz_str,
+)
from git.util import (
Actor,
LockedFD,
LockFile,
assure_directory_exists,
to_native_path,
-)
-
-from gitdb.util import (
bin_to_hex,
- join,
- file_contents_ro_filepath,
+ file_contents_ro_filepath
)
-from git.objects.util import (
- parse_date,
- Serializable,
- altz_to_utctz_str,
-)
-from git.compat import (
- PY3,
- xrange,
- string_types,
- defenc
-)
+import os.path as osp
-import time
-import re
__all__ = ["RefLog", "RefLogEntry"]
@@ -185,7 +183,7 @@ class RefLog(list, Serializable):
instance would be found. The path is not guaranteed to point to a valid
file though.
:param ref: SymbolicReference instance"""
- return join(ref.repo.git_dir, "logs", to_native_path(ref.path))
+ return osp.join(ref.repo.git_dir, "logs", to_native_path(ref.path))
@classmethod
def iter_entries(cls, stream):