summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/cmd.py5
-rw-r--r--git/diff.py5
-rw-r--r--git/objects/commit.py4
-rw-r--r--git/objects/submodule/base.py8
-rw-r--r--git/objects/util.py35
-rw-r--r--git/remote.py9
-rw-r--r--git/repo/base.py82
-rw-r--r--git/repo/fun.py3
8 files changed, 94 insertions, 57 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 134001e2..dfce9024 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -695,15 +695,14 @@ class Git(LazyMixin):
return self
def __next__(self) -> bytes:
- return next(self)
-
- def next(self) -> bytes:
line = self.readline()
if not line:
raise StopIteration
return line
+ next = __next__
+
def __del__(self) -> None:
bytes_left = self._size - self._nbr
if bytes_left:
diff --git a/git/diff.py b/git/diff.py
index c4424592..c1a5bd26 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -144,7 +144,10 @@ class Diffable(object):
args.append("--abbrev=40") # we need full shas
args.append("--full-index") # get full index paths, not only filenames
- args.append("-M") # check for renames, in both formats
+ # remove default '-M' arg (check for renames) if user is overriding it
+ if not any(x in kwargs for x in ('find_renames', 'no_renames', 'M')):
+ args.append("-M")
+
if create_patch:
args.append("-p")
else:
diff --git a/git/objects/commit.py b/git/objects/commit.py
index 82d2387b..547e8fe8 100644
--- a/git/objects/commit.py
+++ b/git/objects/commit.py
@@ -324,14 +324,14 @@ class Commit(base.Object, TraversableIterableObj, Diffable, Serializable):
:return: git.Stats"""
if not self.parents:
- text = self.repo.git.diff_tree(self.hexsha, "--", numstat=True, root=True)
+ text = self.repo.git.diff_tree(self.hexsha, "--", numstat=True, no_renames=True, root=True)
text2 = ""
for line in text.splitlines()[1:]:
(insertions, deletions, filename) = line.split("\t")
text2 += "%s\t%s\t%s\n" % (insertions, deletions, filename)
text = text2
else:
- text = self.repo.git.diff(self.parents[0].hexsha, self.hexsha, "--", numstat=True)
+ text = self.repo.git.diff(self.parents[0].hexsha, self.hexsha, "--", numstat=True, no_renames=True)
return Stats._list_from_string(self.repo, text)
@property
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index 9aa9deb2..7db64d70 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -287,7 +287,9 @@ class Submodule(IndexObject, TraversableIterableObj):
:param url: url to clone from
:param path: repository - relative path to the submodule checkout location
:param name: canonical of the submodule
- :param kwrags: additinoal arguments given to git.clone"""
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
+ :param kwargs: additional arguments given to git.clone"""
module_abspath = cls._module_abspath(repo, path, name)
module_checkout_path = module_abspath
if cls._need_gitfile_submodules(repo.git):
@@ -411,6 +413,8 @@ class Submodule(IndexObject, TraversableIterableObj):
as its value.
:param clone_multi_options: A list of Clone options. Please see ``git.repo.base.Repo.clone``
for details.
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
:return: The newly created submodule instance
:note: works atomically, such that no change will be done if the repository
update fails for instance"""
@@ -581,6 +585,8 @@ class Submodule(IndexObject, TraversableIterableObj):
as its value.
:param clone_multi_options: list of Clone options. Please see ``git.repo.base.Repo.clone``
for details. Only take effect with `init` option.
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
:note: does nothing in bare repositories
:note: method is definitely not atomic if recurisve is True
:return: self"""
diff --git a/git/objects/util.py b/git/objects/util.py
index f405d628..af279154 100644
--- a/git/objects/util.py
+++ b/git/objects/util.py
@@ -137,22 +137,25 @@ def get_object_type_by_name(
def utctz_to_altz(utctz: str) -> int:
- """we convert utctz to the timezone in seconds, it is the format time.altzone
- returns. Git stores it as UTC timezone which has the opposite sign as well,
- which explains the -1 * ( that was made explicit here )
-
- :param utctz: git utc timezone string, i.e. +0200"""
- return -1 * int(float(utctz) / 100 * 3600)
-
-
-def altz_to_utctz_str(altz: float) -> str:
- """As above, but inverses the operation, returning a string that can be used
- in commit objects"""
- utci = -1 * int((float(altz) / 3600) * 100)
- utcs = str(abs(utci))
- utcs = "0" * (4 - len(utcs)) + utcs
- prefix = (utci < 0 and "-") or "+"
- return prefix + utcs
+ """Convert a git timezone offset into a timezone offset west of
+ UTC in seconds (compatible with time.altzone).
+
+ :param utctz: git utc timezone string, i.e. +0200
+ """
+ int_utctz = int(utctz)
+ seconds = ((abs(int_utctz) // 100) * 3600 + (abs(int_utctz) % 100) * 60)
+ return seconds if int_utctz < 0 else -seconds
+
+
+def altz_to_utctz_str(altz: int) -> str:
+ """Convert a timezone offset west of UTC in seconds into a git timezone offset string
+
+ :param altz: timezone offset in seconds west of UTC
+ """
+ hours = abs(altz) // 3600
+ minutes = (abs(altz) % 3600) // 60
+ sign = "-" if altz >= 60 else "+"
+ return "{}{:02}{:02}".format(sign, hours, minutes)
def verify_utctz(offset: str) -> str:
diff --git a/git/remote.py b/git/remote.py
index 3f86a297..5886a69f 100644
--- a/git/remote.py
+++ b/git/remote.py
@@ -641,6 +641,7 @@ class Remote(LazyMixin, IterableObj):
:param new_url: string being the URL to add as an extra remote URL
:param old_url: when set, replaces this URL with new_url for the remote
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
:return: self
"""
if not allow_unsafe_protocols:
@@ -660,6 +661,7 @@ class Remote(LazyMixin, IterableObj):
multiple URLs for a single remote.
:param url: string being the URL to add as an extra remote URL
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
:return: self
"""
return self.set_url(url, add=True, allow_unsafe_protocols=allow_unsafe_protocols)
@@ -760,6 +762,7 @@ class Remote(LazyMixin, IterableObj):
:param repo: Repository instance that is to receive the new remote
:param name: Desired name of the remote
:param url: URL which corresponds to the remote's name
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
:param kwargs: Additional arguments to be passed to the git-remote add command
:return: New Remote instance
:raise GitCommandError: in case an origin with that name already exists"""
@@ -978,6 +981,8 @@ class Remote(LazyMixin, IterableObj):
:param kill_after_timeout:
To specify a timeout in seconds for the git command, after which the process
should be killed. It is set to None by default.
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
:param kwargs: Additional arguments to be passed to git-fetch
:return:
IterableList(FetchInfo, ...) list of FetchInfo instances providing detailed
@@ -1027,6 +1032,8 @@ class Remote(LazyMixin, IterableObj):
:param refspec: see :meth:`fetch` method
:param progress: see :meth:`push` method
:param kill_after_timeout: see :meth:`fetch` method
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
:param kwargs: Additional arguments to be passed to git-pull
:return: Please see :meth:`fetch` method"""
if refspec is None:
@@ -1077,6 +1084,8 @@ class Remote(LazyMixin, IterableObj):
:param kill_after_timeout:
To specify a timeout in seconds for the git command, after which the process
should be killed. It is set to None by default.
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --receive-pack
:param kwargs: Additional arguments to be passed to git-push
:return:
A ``PushInfoList`` object, where each list member
diff --git a/git/repo/base.py b/git/repo/base.py
index 93ed0c71..2fc9cf1f 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -9,6 +9,9 @@ import os
import re
import shlex
import warnings
+
+from pathlib import Path
+
from gitdb.db.loose import LooseObjectDB
from gitdb.exc import BadObject
@@ -112,7 +115,7 @@ class Repo(object):
'working_dir' is the working directory of the git command, which is the working tree
directory if available or the .git directory in case of bare repositories
- 'working_tree_dir' is the working tree directory, but will raise AssertionError
+ 'working_tree_dir' is the working tree directory, but will return None
if we are a bare repository.
'git_dir' is the .git repository directory, which is always set."""
@@ -120,9 +123,9 @@ class Repo(object):
DAEMON_EXPORT_FILE = "git-daemon-export-ok"
git = cast("Git", None) # Must exist, or __del__ will fail in case we raise on `__init__()`
- working_dir: Optional[PathLike] = None
+ working_dir: PathLike
_working_tree_dir: Optional[PathLike] = None
- git_dir: PathLike = ""
+ git_dir: PathLike
_common_dir: PathLike = ""
# precompiled regex
@@ -212,13 +215,14 @@ class Repo(object):
## Walk up the path to find the `.git` dir.
#
curpath = epath
+ git_dir = None
while curpath:
# ABOUT osp.NORMPATH
# It's important to normalize the paths, as submodules will otherwise initialize their
# repo instances with paths that depend on path-portions that will not exist after being
# removed. It's just cleaner.
if is_git_dir(curpath):
- self.git_dir = curpath
+ git_dir = curpath
# from man git-config : core.worktree
# Set the path to the root of the working tree. If GIT_COMMON_DIR environment
# variable is set, core.worktree is ignored and not used for determining the
@@ -227,9 +231,9 @@ class Repo(object):
# directory, which is either specified by GIT_DIR, or automatically discovered.
# If GIT_DIR is specified but none of GIT_WORK_TREE and core.worktree is specified,
# the current working directory is regarded as the top level of your working tree.
- self._working_tree_dir = os.path.dirname(self.git_dir)
+ self._working_tree_dir = os.path.dirname(git_dir)
if os.environ.get("GIT_COMMON_DIR") is None:
- gitconf = self.config_reader("repository")
+ gitconf = self._config_reader("repository", git_dir)
if gitconf.has_option("core", "worktree"):
self._working_tree_dir = gitconf.get("core", "worktree")
if "GIT_WORK_TREE" in os.environ:
@@ -239,14 +243,14 @@ class Repo(object):
dotgit = osp.join(curpath, ".git")
sm_gitpath = find_submodule_git_dir(dotgit)
if sm_gitpath is not None:
- self.git_dir = osp.normpath(sm_gitpath)
+ git_dir = osp.normpath(sm_gitpath)
sm_gitpath = find_submodule_git_dir(dotgit)
if sm_gitpath is None:
sm_gitpath = find_worktree_git_dir(dotgit)
if sm_gitpath is not None:
- self.git_dir = expand_path(sm_gitpath, expand_vars)
+ git_dir = expand_path(sm_gitpath, expand_vars)
self._working_tree_dir = curpath
break
@@ -257,8 +261,9 @@ class Repo(object):
break
# END while curpath
- if self.git_dir is None:
+ if git_dir is None:
raise InvalidGitRepositoryError(epath)
+ self.git_dir = git_dir
self._bare = False
try:
@@ -268,7 +273,7 @@ class Repo(object):
pass
try:
- common_dir = open(osp.join(self.git_dir, "commondir"), "rt").readlines()[0].strip()
+ common_dir = (Path(self.git_dir) / "commondir").read_text().splitlines()[0].strip()
self._common_dir = osp.join(self.git_dir, common_dir)
except OSError:
self._common_dir = ""
@@ -279,7 +284,7 @@ class Repo(object):
self._working_tree_dir = None
# END working dir handling
- self.working_dir: Optional[PathLike] = self._working_tree_dir or self.common_dir
+ self.working_dir: PathLike = self._working_tree_dir or self.common_dir
self.git = self.GitCommandWrapperType(self.working_dir)
# special handling, in special times
@@ -317,7 +322,7 @@ class Repo(object):
gc.collect()
def __eq__(self, rhs: object) -> bool:
- if isinstance(rhs, Repo) and self.git_dir:
+ if isinstance(rhs, Repo):
return self.git_dir == rhs.git_dir
return False
@@ -329,14 +334,12 @@ class Repo(object):
# Description property
def _get_description(self) -> str:
- if self.git_dir:
- filename = osp.join(self.git_dir, "description")
+ filename = osp.join(self.git_dir, "description")
with open(filename, "rb") as fp:
return fp.read().rstrip().decode(defenc)
def _set_description(self, descr: str) -> None:
- if self.git_dir:
- filename = osp.join(self.git_dir, "description")
+ filename = osp.join(self.git_dir, "description")
with open(filename, "wb") as fp:
fp.write((descr + "\n").encode(defenc))
@@ -354,13 +357,7 @@ class Repo(object):
"""
:return: The git dir that holds everything except possibly HEAD,
FETCH_HEAD, ORIG_HEAD, COMMIT_EDITMSG, index, and logs/."""
- if self._common_dir:
- return self._common_dir
- elif self.git_dir:
- return self.git_dir
- else:
- # or could return ""
- raise InvalidGitRepositoryError()
+ return self._common_dir or self.git_dir
@property
def bare(self) -> bool:
@@ -529,7 +526,9 @@ class Repo(object):
"""Delete the given remote."""
return Remote.remove(self, remote)
- def _get_config_path(self, config_level: Lit_config_levels) -> str:
+ def _get_config_path(self, config_level: Lit_config_levels, git_dir: Optional[PathLike] = None) -> str:
+ if git_dir is None:
+ git_dir = self.git_dir
# we do not support an absolute path of the gitconfig on windows ,
# use the global config instead
if is_win and config_level == "system":
@@ -543,7 +542,7 @@ class Repo(object):
elif config_level == "global":
return osp.normpath(osp.expanduser("~/.gitconfig"))
elif config_level == "repository":
- repo_dir = self._common_dir or self.git_dir
+ repo_dir = self._common_dir or git_dir
if not repo_dir:
raise NotADirectoryError
else:
@@ -572,15 +571,21 @@ class Repo(object):
you know which file you wish to read to prevent reading multiple files.
:note: On windows, system configuration cannot currently be read as the path is
unknown, instead the global path will be used."""
- files = None
+ return self._config_reader(config_level=config_level)
+
+ def _config_reader(
+ self,
+ config_level: Optional[Lit_config_levels] = None,
+ git_dir: Optional[PathLike] = None,
+ ) -> GitConfigParser:
if config_level is None:
files = [
- self._get_config_path(cast(Lit_config_levels, f))
+ self._get_config_path(cast(Lit_config_levels, f), git_dir)
for f in self.config_level
if cast(Lit_config_levels, f)
]
else:
- files = [self._get_config_path(config_level)]
+ files = [self._get_config_path(config_level, git_dir)]
return GitConfigParser(files, read_only=True, repo=self)
def config_writer(self, config_level: Lit_config_levels = "repository") -> GitConfigParser:
@@ -870,8 +875,15 @@ class Repo(object):
"""
try:
proc: str = self.git.check_ignore(*paths)
- except GitCommandError:
- return []
+ except GitCommandError as err:
+ # If return code is 1, this means none of the items in *paths
+ # are ignored by Git, so return an empty list. Raise the
+ # exception on all other return codes.
+ if err.status == 1:
+ return []
+ else:
+ raise
+
return proc.replace("\\\\", "\\").replace('"', "").split("\n")
@property
@@ -1259,7 +1271,8 @@ class Repo(object):
option per list item which is passed exactly as specified to clone.
For example ['--config core.filemode=false', '--config core.ignorecase',
'--recurse-submodule=repo1_path', '--recurse-submodule=repo2_path']
- :param unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
:param kwargs:
* odbt = ObjectDatabase Type, allowing to determine the object database
implementation used by the returned Repo instance
@@ -1302,7 +1315,8 @@ class Repo(object):
If you want to unset some variable, consider providing empty string
as its value.
:param multi_options: See ``clone`` method
- :param unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_protocols: Allow unsafe protocols to be used, like ext
+ :param allow_unsafe_options: Allow unsafe options to be used, like --upload-pack
:param kwargs: see the ``clone`` method
:return: Repo instance pointing to the cloned directory"""
git = cls.GitCommandWrapperType(os.getcwd())
@@ -1383,4 +1397,6 @@ class Repo(object):
rebase_head_file = osp.join(self.git_dir, "REBASE_HEAD")
if not osp.isfile(rebase_head_file):
return None
- return self.commit(open(rebase_head_file, "rt").readline().strip())
+ with open(rebase_head_file, "rt") as f:
+ content = f.readline().strip()
+ return self.commit(content)
diff --git a/git/repo/fun.py b/git/repo/fun.py
index 2ca2e3d6..ae35aa81 100644
--- a/git/repo/fun.py
+++ b/git/repo/fun.py
@@ -2,6 +2,7 @@
from __future__ import annotations
import os
import stat
+from pathlib import Path
from string import digits
from git.exc import WorkTreeRepositoryUnsupported
@@ -83,7 +84,7 @@ def find_worktree_git_dir(dotgit: "PathLike") -> Optional[str]:
return None
try:
- lines = open(dotgit, "r").readlines()
+ lines = Path(dotgit).read_text().splitlines()
for key, value in [line.strip().split(": ") for line in lines]:
if key == "gitdir":
return value
View Lorry Controller Status