ogenstad
commented
1 year ago The problem here is that the find_files() method below gets called without a branch_name and the commit parameter set to True (another case where mypy could have saved us).
async def find_files(
self,
extension: Union[str, List[str]],
branch_name: Optional[str] = None,
commit: Optional[str] = None,
recursive: bool = True,
) -> List[str]:
"""Return the absolute path of all files matching a specific extension in a given Branch or Commit."""
if not branch_name and not commit:
raise ValueError("Either branch_name or commit must be provided.")
branch_wt = self.get_worktree(identifier=commit or branch_name)
files = []
if isinstance(extension, str):
files.extend(glob.glob(f"{branch_wt.directory}/**/*.{extension}", recursive=recursive))
files.extend(glob.glob(f"{branch_wt.directory}/**/.*.{extension}", recursive=recursive))
elif isinstance(extension, list):
for ext in extension:
files.extend(glob.glob(f"{branch_wt.directory}/**/*.{ext}", recursive=recursive))
files.extend(glob.glob(f"{branch_wt.directory}/**/.*.{ext}", recursive=recursive))
return filesWithin the .sync() method of the Repo class we have these lines:
commit_after = await self.pull(branch_name=branch_name)
await self.import_objects_from_files(branch_name=branch_name, commit=commit_after)The problem here is that self.pull returns -> Union[bool, str]: where as import_objects_from_files expects commit be be a string or None.
async def import_objects_from_files(self, branch_name: str, commit: Optional[str] = None):
if not self.client:
LOGGER.warning("Unable to import the objects from the files because a valid client hasn't been provided.")
return
if not commit:
commit = self.get_commit_value(branch_name=branch_name)The self.pull method returns True if the commit_before is the same as the commit_after.
Not sure if there are any other side effects of this, but a solution could be to raise an error if self.has_origin isn't true and instead of having the return True if both commits are the same we just return that commit early as a string.
async def pull(self, branch_name: str) -> Union[bool, str]:
"""Pull the latest update from the remote repository on a given branch."""
if not self.has_origin:
return False
repo = self.get_git_repo_worktree(identifier=branch_name)
if not repo:
raise ValueError(f"Unable to identify the worktree for the branch : {branch_name}")
try:
commit_before = str(repo.head.commit)
repo.remotes.origin.pull(branch_name)
except GitCommandError as exc:
if "Need to specify how to reconcile" in exc.stderr:
raise RepositoryError(
identifier=self.name,
message=f"Unable to pull the branch {branch_name} for repository {self.name}, there is a conflict that must be resolved.",
) from exc
raise RepositoryError(identifier=self.name, message=exc.stderr) from exc
commit_after = str(repo.head.commit)
if commit_after == commit_before:
return True
self.create_commit_worktree(commit=commit_after)
await self.update_commit_value(branch_name=branch_name, commit=commit_after)
return commit_after
dgarros
BRBCoffeeDebuff
Component
Git Integration
Current Behavior
After merging a branch that contains an external repository that has changes there is an exception from the git-agent.
Expected Behavior
No response
Steps to Reproduce
No response
Additional Information
Possibly related to the changes when we changed the worktree to be based on the branch_id instead of name.