diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2016-10-22 11:11:25 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2016-10-22 11:11:25 +0200 |
commit | caa0ea7a0893fe90ea043843d4e6ad407126d7b8 (patch) | |
tree | 2f688eb182f2e76091134c47c4a327681c12e15b /git/refs/log.py | |
parent | afcd64ebbb770908bd2a751279ff070dea5bb97c (diff) | |
parent | cc77e6b2862733a211c55cf29cc7a83c36c27919 (diff) | |
download | gitpython-caa0ea7a0893fe90ea043843d4e6ad407126d7b8.tar.gz |
Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ankostis-cygwin
Diffstat (limited to 'git/refs/log.py')
-rw-r--r-- | git/refs/log.py | 36 |
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): |