Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-31 10:03:58 -05:00
Code Issues Activity

fix bootstrap-without-vcs.patch

Browse source
This commit is contained in:
Malte Jürgens 2023-03-15 11:41:39 +01:00
parent f01e22291b
commit 46a6f86069
No known key found for this signature in database
GPG key ID: D29FBD5F93C0CFC3
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
patches/bootstrap-without-vcs.patch
View file

@ -2,7 +2,7 @@
# #
# Author: Malte Jürgens <maltejur@dismail.de> # Author: Malte Jürgens <maltejur@dismail.de>
# Description: Allow mach bootstrapping without a VCS checkout # Description: Allow mach bootstrapping without a VCS checkout
# Last Updated: 2023-01-18 # Last Updated: 2023-03-15
# License: MPL 2.0 # License: MPL 2.0
# #
# This patch allows you to use `./mach bootstrap` without a VCS checkout. # This patch allows you to use `./mach bootstrap` without a VCS checkout.
@ -12,7 +12,7 @@
# things in mach, but we don't use those. # things in mach, but we don't use those.
--- a/python/mozboot/mozboot/bootstrap.py --- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py +++ b/python/mozboot/mozboot/bootstrap.py
@@ -628,10 +628,7 @@ def current_firefox_checkout(env, hg: Op @@ -628,10 +628,7 @@ def current_firefox_checkout(env, hg: Optional[Path] = None):
break break
path = path.parent path = path.parent
@ -26,7 +26,7 @@
def update_git_tools(git: Optional[Path], root_state_dir: Path): def update_git_tools(git: Optional[Path], root_state_dir: Path):
--- a/python/mozversioncontrol/mozversioncontrol/__init__.py --- a/python/mozversioncontrol/mozversioncontrol/__init__.py
+++ b/python/mozversioncontrol/mozversioncontrol/__init__.py +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
@@ -760,6 +760,29 @@ class GitRepository(Repository): @@ -744,6 +744,29 @@ class GitRepository(Repository):
self._run("config", name, value) self._run("config", name, value)
@ -56,7 +56,7 @@
def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"): def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
"""Get a repository object for the repository at `path`. """Get a repository object for the repository at `path`.
If `path` is not a known VCS repository, raise an exception. If `path` is not a known VCS repository, raise an exception.
@@ -773,7 +796,7 @@ def get_repository_object(path: Optional @@ -757,7 +780,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
elif (path / ".git").exists(): elif (path / ".git").exists():
return GitRepository(path, git=git) return GitRepository(path, git=git)
else: else:
@ -65,7 +65,7 @@
def get_repository_from_build_config(config): def get_repository_from_build_config(config):
@@ -797,6 +820,8 @@ def get_repository_from_build_config(con @@ -781,6 +804,8 @@ def get_repository_from_build_config(config):
return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"]) return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"])
elif flavor == "git": elif flavor == "git":
return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"]) return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"])
@ -76,15 +76,15 @@
--- a/third_party/python/mozilla_repo_urls/mozilla_repo_urls/parser.py --- a/third_party/python/mozilla_repo_urls/mozilla_repo_urls/parser.py
+++ b/third_party/python/mozilla_repo_urls/mozilla_repo_urls/parser.py +++ b/third_party/python/mozilla_repo_urls/mozilla_repo_urls/parser.py
@@ -9,7 +9,7 @@ for i, platform in enumerate(ADDITIONAL_ @@ -9,7 +9,7 @@ for i, platform in enumerate(ADDITIONAL_PLATFORMS):
giturlparse.platforms.PLATFORMS.insert(i, platform) giturlparse.platforms.PLATFORMS.insert(i, platform)
-_SUPPORTED_PLAFORMS = ("hgmo", "github") -_SUPPORTED_PLATFORMS = ("hgmo", "github")
+_SUPPORTED_PLAFORMS = ("hgmo", "github", "gitlab") +_SUPPORTED_PLATFORMS = ("hgmo", "github", "gitlab")
def parse(url_string): SUPPORTED_HOSTS = tuple(
--- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py --- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py +++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
@@ -495,6 +495,64 @@ class GitRepository(Repository): @@ -495,6 +495,64 @@ class GitRepository(Repository):