Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions src/fuzzfetch/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,7 @@ def __init__(
self._task = build

options = self._flags.build_string()
if self._branch in {"autoland", "try"}:
branch = self._branch
else:
namespace_initial = (
self._product.namespace[0]
if self._product.namespace is not None
else ""
)
branch = f"{namespace_initial}-{self._branch[0]}"
branch = self._product.prefix_branch_short(self._branch)
self._auto_name = (
f"{self._platform.auto_name_prefix()}{branch}-{self.id}{options}"
)
Expand Down
21 changes: 16 additions & 5 deletions src/fuzzfetch/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -477,12 +477,23 @@ class Product:
}
)

def __init__(self, product: str | None = None):
def __init__(self, product: str):
assert self.PREFIXES.keys() == self.NAMESPACES.keys()
if product not in self.NAMESPACES:
raise FetcherException(f"Unknown product: {product}")
self.name = product
self.prefix = (
self.PREFIXES.get(product) if product and product in self.PREFIXES else ""
)
self.namespace = self.NAMESPACES.get(product) if product else None
self.prefix = self.PREFIXES[product]
self.namespace = self.NAMESPACES[product]

def prefix_branch_short(self, branch: str) -> str:
"""shorter version of `prefix_branch` for output naming (eg. m-c)"""
parts = []
for part in self.prefix_branch(branch).split("-"):
if part in {"autoland", "try"} or part.startswith("esr"):
parts.append(part)
else:
parts.append(part[0])
return "-".join(parts)

def prefix_branch(self, branch: str) -> str:
"""add the appropriate prefix to the branch name (e.g., beta -> mozilla-beta)"""
Expand Down
Loading