mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-19 23:11:44 +01:00
git: verify commit user is set (#5754)
This commit is contained in:
@@ -182,11 +182,16 @@ class DulwichBackend(BaseGitBackend): # pylint:disable=abstract-method
|
|||||||
def commit(self, msg: str, no_verify: bool = False):
|
def commit(self, msg: str, no_verify: bool = False):
|
||||||
from dulwich.errors import CommitError
|
from dulwich.errors import CommitError
|
||||||
from dulwich.porcelain import commit
|
from dulwich.porcelain import commit
|
||||||
|
from dulwich.repo import InvalidUserIdentity
|
||||||
|
|
||||||
try:
|
try:
|
||||||
commit(self.root_dir, message=msg, no_verify=no_verify)
|
commit(self.root_dir, message=msg, no_verify=no_verify)
|
||||||
except CommitError as exc:
|
except CommitError as exc:
|
||||||
raise SCMError("Git commit failed") from exc
|
raise SCMError("Git commit failed") from exc
|
||||||
|
except InvalidUserIdentity as exc:
|
||||||
|
raise SCMError(
|
||||||
|
"Git username and email must be configured"
|
||||||
|
) from exc
|
||||||
|
|
||||||
def checkout(
|
def checkout(
|
||||||
self,
|
self,
|
||||||
@@ -528,6 +533,8 @@ class DulwichBackend(BaseGitBackend): # pylint:disable=abstract-method
|
|||||||
message: Optional[str] = None,
|
message: Optional[str] = None,
|
||||||
include_untracked: Optional[bool] = False,
|
include_untracked: Optional[bool] = False,
|
||||||
) -> Tuple[Optional[str], bool]:
|
) -> Tuple[Optional[str], bool]:
|
||||||
|
from dulwich.repo import InvalidUserIdentity
|
||||||
|
|
||||||
from dvc.scm.git import Stash
|
from dvc.scm.git import Stash
|
||||||
|
|
||||||
if include_untracked or ref == Stash.DEFAULT_STASH:
|
if include_untracked or ref == Stash.DEFAULT_STASH:
|
||||||
@@ -537,7 +544,12 @@ class DulwichBackend(BaseGitBackend): # pylint:disable=abstract-method
|
|||||||
|
|
||||||
stash = self._get_stash(ref)
|
stash = self._get_stash(ref)
|
||||||
message_b = message.encode("utf-8") if message else None
|
message_b = message.encode("utf-8") if message else None
|
||||||
rev = stash.push(message=message_b)
|
try:
|
||||||
|
rev = stash.push(message=message_b)
|
||||||
|
except InvalidUserIdentity as exc:
|
||||||
|
raise SCMError(
|
||||||
|
"Git username and email must be configured"
|
||||||
|
) from exc
|
||||||
return os.fsdecode(rev), True
|
return os.fsdecode(rev), True
|
||||||
|
|
||||||
def _stash_apply(self, rev: str):
|
def _stash_apply(self, rev: str):
|
||||||
|
|||||||
@@ -80,6 +80,15 @@ class Pygit2Backend(BaseGitBackend): # pylint:disable=abstract-method
|
|||||||
|
|
||||||
return RefdbFsBackend(self.repo)
|
return RefdbFsBackend(self.repo)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def default_signature(self):
|
||||||
|
try:
|
||||||
|
return self.repo.default_signature
|
||||||
|
except KeyError as exc:
|
||||||
|
raise SCMError(
|
||||||
|
"Git username and email must be configured"
|
||||||
|
) from exc
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def clone(
|
def clone(
|
||||||
url: str,
|
url: str,
|
||||||
@@ -328,7 +337,7 @@ class Pygit2Backend(BaseGitBackend): # pylint:disable=abstract-method
|
|||||||
from dvc.scm.git import Stash
|
from dvc.scm.git import Stash
|
||||||
|
|
||||||
oid = self.repo.stash(
|
oid = self.repo.stash(
|
||||||
self.repo.default_signature,
|
self.default_signature,
|
||||||
message=message,
|
message=message,
|
||||||
include_untracked=include_untracked,
|
include_untracked=include_untracked,
|
||||||
)
|
)
|
||||||
@@ -503,7 +512,7 @@ class Pygit2Backend(BaseGitBackend): # pylint:disable=abstract-method
|
|||||||
raise MergeConflictError("Merge contained conflicts")
|
raise MergeConflictError("Merge contained conflicts")
|
||||||
|
|
||||||
if commit:
|
if commit:
|
||||||
user = self.repo.default_signature
|
user = self.default_signature
|
||||||
tree = self.repo.index.write_tree()
|
tree = self.repo.index.write_tree()
|
||||||
merge_commit = self.repo.create_commit(
|
merge_commit = self.repo.create_commit(
|
||||||
"HEAD", user, user, msg, tree, [self.repo.head.target, rev]
|
"HEAD", user, user, msg, tree, [self.repo.head.target, rev]
|
||||||
|
|||||||
Reference in New Issue
Block a user