Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Pre-Commit] Continue Even if Fetch Failed #3878

Merged
merged 11 commits into from
Jan 30, 2024
Merged

[Pre-Commit] Continue Even if Fetch Failed #3878

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26b8db3
Add `try` and `except` blocks
MichaelYochpaz Dec 19, 2023
51a10d2
Bypass logger circular import issues
MichaelYochpaz Dec 19, 2023
d087dc2
Add release notes
MichaelYochpaz Jan 17, 2024
5d9e4e6
Import logger
MichaelYochpaz Jan 17, 2024
ded91f0
Update log message
MichaelYochpaz Jan 17, 2024
741a85c
pre-commit
MichaelYochpaz Jan 17, 2024
8e8f478
Update .changelog/3878.yml
MichaelYochpaz Jan 29, 2024
d7fa59b
Merge branch 'master' into pre-commit-continue-on-fetch-failure
MichaelYochpaz Jan 29, 2024
bb4145d
Remove lru_cache
MichaelYochpaz Jan 30, 2024
a33518b
Address review notes
MichaelYochpaz Jan 30, 2024
c11e2ef
Minor change
MichaelYochpaz Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/3878.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
changes:
- description: Fixed an issue where the **pre-commit** command would fail if there are connection issues with the git repository.
MichaelYochpaz marked this conversation as resolved.
Show resolved Hide resolved
type: fix
- description: Fixed an issue where if running `git fetch` would fail on `git_util._get_all_changed_files`, an error would be raised.
type: internal
MichaelYochpaz marked this conversation as resolved.
Show resolved Hide resolved
pr_number: 3878
11 changes: 10 additions & 1 deletion demisto_sdk/commands/common/git_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
DEMISTO_GIT_UPSTREAM,
PACKS_FOLDER,
)
from demisto_sdk.commands.common.logger import logger
MichaelYochpaz marked this conversation as resolved.
Show resolved Hide resolved


class CommitOrBranchNotFoundError(GitError):
Expand Down Expand Up @@ -624,7 +625,15 @@ def _get_all_changed_files(self, prev_ver: str = "") -> Set[Path]:
Returns:
Set: of Paths to files changed in the current branch.
"""
self.fetch()
try:
self.fetch()

except Exception as e:
logger.warning(
"Failed to fetch remote branch. Continuing without fetching."
MichaelYochpaz marked this conversation as resolved.
Show resolved Hide resolved
)
logger.debug(f"Error: {e}")

remote, branch = self.handle_prev_ver(prev_ver)
current_hash = self.get_current_commit_hash()

Expand Down
Loading