mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 05:33:03 -05:00
7a329356cb
defuzz 107.0 attempt 1 See merge request librewolf-community/browser/source!46
130 lines
4.1 KiB
Diff
130 lines
4.1 KiB
Diff
--- a/python/mozboot/mozboot/bootstrap.py
|
|
+++ b/python/mozboot/mozboot/bootstrap.py
|
|
@@ -619,10 +619,7 @@ def current_firefox_checkout(env, hg: Op
|
|
break
|
|
path = path.parent
|
|
|
|
- raise UserError(
|
|
- "Could not identify the root directory of your checkout! "
|
|
- "Are you running `mach bootstrap` in an hg or git clone?"
|
|
- )
|
|
+ return ("local", Path.cwd())
|
|
|
|
|
|
def update_git_tools(git: Optional[Path], root_state_dir: Path):
|
|
--- 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
|
|
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(con
|
|
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)
|
|
|
|
--- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
|
|
+++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
|
|
@@ -495,6 +495,43 @@ class GitRepository(Repository):
|
|
raise
|
|
|
|
|
|
+class LocalRepository(Repository):
|
|
+ tool = "true"
|
|
+
|
|
+ @property
|
|
+ def head_ref(self):
|
|
+ return ""
|
|
+
|
|
+ def get_outgoing_files(self):
|
|
+ return []
|
|
+
|
|
+ def get_changed_files(self):
|
|
+ return []
|
|
+
|
|
+ def base_ref(self):
|
|
+ raise Exception("Unimplemented")
|
|
+
|
|
+ def branch(self):
|
|
+ raise Exception("Unimplemented")
|
|
+
|
|
+ def get_commit_message(self):
|
|
+ raise Exception("Unimplemented")
|
|
+
|
|
+ def get_url(self):
|
|
+ return ""
|
|
+
|
|
+ def update(self):
|
|
+ raise Exception("Unimplemented")
|
|
+
|
|
+ def working_directory_clean(self):
|
|
+ raise Exception("Unimplemented")
|
|
+
|
|
+ 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(path):
|
|
"""Get a repository object for the repository at `path`.
|
|
If `path` is not a known VCS repository, raise an exception.
|
|
@@ -505,7 +542,7 @@ def get_repository(path):
|
|
elif os.path.exists(os.path.join(path, ".git")):
|
|
return GitRepository(path)
|
|
|
|
- raise RuntimeError("Current directory is neither a git or hg repository")
|
|
+ return LocalRepository(path)
|
|
|
|
|
|
def find_hg_revision_push_info(repository, revision):
|
|
--- a/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_PLATFORMS):
|
|
giturlparse.platforms.PLATFORMS.insert(i, platform)
|
|
|
|
|
|
-_SUPPORTED_PLAFORMS = ("hgmo", "github")
|
|
+_SUPPORTED_PLAFORMS = ("hgmo", "github", "gitlab")
|
|
|
|
|
|
def parse(url_string):
|