Skip to content

Bitbucket Cloud: Diffstat has more possibles states #940

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

Merged
merged 1 commit into from
Feb 8, 2022
Merged

Bitbucket Cloud: Diffstat has more possibles states #940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion atlassian/bitbucket/cloud/repositories/diffstat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ class DiffStat(BitbucketCloudBase):
MODIFIED = "modified"
ADDED = "added"
REMOVED = "removed"
LOCAL_DELETED = "local deleted"
REMOTE_DELETED = "remote deleted"
MERGE_CONFLICT = "merge conflict"
RENAME_CONFLICT = "rename conflict"
RENAME_DELETE_CONFLICT = "rename/delete conflict"
SUBREPO_CONFLICT = "subrepo conflict"

def __init__(self, data, *args, **kwargs):
Expand Down Expand Up @@ -43,7 +47,14 @@ def new(self):
@property
def has_conflict(self):
"""True if the change causes a conflict."""
return str(self.get_data("status")) in (self.MERGE_CONFLICT, self.SUBREPO_CONFLICT)
return str(self.get_data("status")) in [
self.MERGE_CONFLICT,
self.RENAME_CONFLICT,
self.RENAME_DELETE_CONFLICT,
self.SUBREPO_CONFLICT,
self.LOCAL_DELETED,
self.REMOTE_DELETED,
]


class CommitFile(BitbucketCloudBase):
Expand Down