0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 21:53:31 -05:00

Revert "Revert "fix bootstrap-without-vcs.patch for latest firefox""

This reverts commit d1ca5248bc.
This commit is contained in:
Malte Jürgens 2022-03-30 16:17:30 +02:00
parent d1ca5248bc
commit 99d294bede
No known key found for this signature in database
GPG key ID: D29FBD5F93C0CFC3
3 changed files with 17 additions and 82 deletions

View file

@ -1,5 +1,5 @@
patches/allow-ubo-private-mode.patch patches/allow-ubo-private-mode.patch
patches/bootstrap-without-vcs2.patch patches/bootstrap-without-vcs.patch
patches/context-menu.patch patches/context-menu.patch
patches/custom-ubo-assets-bootstrap-location.patch patches/custom-ubo-assets-bootstrap-location.patch
patches/disable-data-reporting-at-compile-time.patch patches/disable-data-reporting-at-compile-time.patch

View file

@ -1,20 +1,22 @@
--- a/python/mozboot/mozboot/bootstrap.py --- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py +++ b/python/mozboot/mozboot/bootstrap.py
@@ -542,10 +542,7 @@ def current_firefox_checkout(env, hg=None): @@ -548,11 +548,9 @@ def current_firefox_checkout(env, hg: Optional[Path] = None):
if child == "":
if not len(path.parents):
break break
+ path = path.parent
- raise UserError( - raise UserError(
- "Could not identify the root directory of your checkout! " - "Could not identify the root directory of your checkout! "
- "Are you running `mach bootstrap` in an hg or git clone?" - "Are you running `mach bootstrap` in an hg or git clone?"
- ) - )
+ return ("local", os.getcwd()) + return ("local", Path.cwd())
def update_git_tools(git, root_state_dir): 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
@@ -672,6 +672,27 @@ class GitRepository(Repository): @@ -684,6 +684,29 @@ class GitRepository(Repository):
self._run("config", name, value) self._run("config", name, value)
@ -39,22 +41,24 @@
+ return FileListFinder(files) + return FileListFinder(files)
+ +
+ +
def get_repository_object(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.
@@ -681,7 +696,7 @@ def get_repository_object(path, hg="hg", git="git"): @@ -697,7 +720,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
elif os.path.exists(os.path.join(path, ".git")): elif (path / ".git").exists():
return GitRepository(path, git=git) return GitRepository(path, git=git)
else: else:
- raise InvalidRepoPath("Unknown VCS, or not a source checkout: %s" % path) - raise InvalidRepoPath(f"Unknown VCS, or not a source checkout: {path}")
+ return LocalRepository(path) + return LocalRepository(path)
def get_repository_from_build_config(config): def get_repository_from_build_config(config):
@@ -705,6 +720,8 @@ def get_repository_from_build_config(config): @@ -721,6 +744,8 @@ def get_repository_from_build_config(config):
return HgRepository(config.topsrcdir, hg=config.substs["HG"]) return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"])
elif flavor == "git": elif flavor == "git":
return GitRepository(config.topsrcdir, git=config.substs["GIT"]) return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"])
+ elif flavor == "local": + elif flavor == "local":
+ return LocalRepository(config.topsrcdir) + return LocalRepository(config.topsrcdir)
else: else:

View file

@ -1,69 +0,0 @@
diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
index b0d6965..8ea2e15 100644
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -549,10 +549,8 @@ def current_firefox_checkout(env, hg: Optional[Path] = None):
if not len(path.parents):
break
- raise UserError(
- "Could not identify the root directory of your checkout! "
- "Are you running `mach bootstrap` in an hg or git clone?"
- )
+ return ("local", os.getcwd())
+
def update_git_tools(git: Optional[Path], root_state_dir: Path):
diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py
index dd31f53..6f0087a 100644
--- a/python/mozversioncontrol/mozversioncontrol/__init__.py
+++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
@@ -684,6 +684,29 @@ class GitRepository(Repository):
self._run("config", name, value)
+class LocalRepository(Repository):
+
+ def __init__(self, path):
+ super(LocalRepository, self).__init__(path, tool="true")
+
+ @property
+ def head_ref(self):
+ return ""
+
+ def get_outgoing_files(self):
+ return []
+
+ def get_changed_files(self):
+ return []
+
+ def get_tracked_files_finder(self):
+ files = [os.path.relpath(os.path.join(dp, f), self.path).replace("\\","/") for dp, dn, fn in os.walk(self.path) for f in fn]
+ files.sort()
+ return FileListFinder(files)
+
+
+
+
def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
"""Get a repository object for the repository at `path`.
If `path` is not a known VCS repository, raise an exception.
@@ -697,7 +720,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
elif (path / ".git").exists():
return GitRepository(path, git=git)
else:
- raise InvalidRepoPath(f"Unknown VCS, or not a source checkout: {path}")
+ return LocalRepository(path)
def get_repository_from_build_config(config):
@@ -721,6 +744,8 @@ def get_repository_from_build_config(config):
return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"])
elif flavor == "git":
return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"])
+ elif flavor == "local":
+ return LocalRepository(config.topsrcdir)
else:
raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor)