Revert "Merge pull request #21 from ConchuOD/pre-reqs"

This reverts commit c6b2e3a, reversing
changes made to c277cfd.

Author: ConchuOD

core/series.py

@@ -43,21 +43,3 @@ def add_patch(self, patch):
 
     def is_pure_pull(self):
         return bool(self.pull_url)
-
-    def depends_from_cover(self):
-        if not self.cover_letter:
-            return False
-
-        depends_section = re.compile(r'(?:based.on|depends.on|depend(?:a|e)ncies):\n(?:\S+@\S+\n)*', re.IGNORECASE | re.MULTILINE)
-        depends = re.compile(r'\S+@\S+', re.IGNORECASE)
-        match = depends_section.search(self.cover_letter)
-
-        if not match:
-            # fall back to patchew's git trailer style & try that
-            patchew_section = re.compile(r'(?:based.on: \S+@\S+\n)+', re.IGNORECASE | re.MULTILINE)
-            match = patchew_section.search(self.cover_letter)
-
-        if match:
-            return depends.findall(match.group(0))
-
-        return False

core/tester.py

@@ -157,20 +157,13 @@ def _test_series_patches(self, tree, series, series_dir):
                     fp.write("0")
                 with open(os.path.join(series_apply, "desc"), "w+") as fp:
                     fp.write(f"Patch already applied to {tree.name}")
-                return [already_applied], [already_applied]
             else:
                 core.log("Series does not apply", "")
-                if not tree.check_applies_with_depends(series):
-                    with open(os.path.join(series_apply, "retcode"), "w+") as fp:
-                        fp.write("1")
-                    with open(os.path.join(series_apply, "desc"), "w+") as fp:
-                        fp.write(f"Patch does not apply to {tree.name}")
-                    return [already_applied], [already_applied]
-                else:
-                    with open(os.path.join(series_apply, "retcode"), "w+") as fp:
-                        fp.write("0")
-                    with open(os.path.join(series_apply, "desc"), "w+") as fp:
-                        fp.write(f"Patch does not apply to {tree.name} without dependencies")
+                with open(os.path.join(series_apply, "retcode"), "w+") as fp:
+                    fp.write("1")
+                with open(os.path.join(series_apply, "desc"), "w+") as fp:
+                    fp.write(f"Patch does not apply to {tree.name}")
+            return [already_applied], [already_applied]
 
         series_ret = []
         patch_ret = []

core/tree.py

@@ -10,7 +10,6 @@
 
 import core
 import core.cmd as CMD
-import core.series as SERIES
 from core import Patch
 
 
@@ -158,19 +157,6 @@ def _apply_patch_safe(self, patch):
                 pass
             raise PatchApplyError(e) from e
 
-    def apply_prereqs(self, prereqs):
-        for link in prereqs:
-            command = ["/stuff/b4/b4.sh", "shazam", link]
-            try:
-                CMD.cmd_run(command, cwd=self.path)
-            except CMD.CmdError as e:
-                print(f"failed! {e}")
-                try:
-                    self.git(["am", "--abort"])
-                except CMD.CmdError:
-                    pass
-                raise PatchApplyError(e) from e
-
     def apply(self, thing):
         if isinstance(thing, Patch):
             self._apply_patch_safe(thing)
@@ -193,25 +179,6 @@ def check_applies(self, thing):
 
         return ret
 
-    def check_applies_with_depends(self, thing):
-        core.log_open_sec("Test-applying " + thing.title)
-        try:
-            self.reset()
-
-            if hasattr(thing, "cover_letter"):
-                depends = thing.depends_from_cover()
-                if depends:
-                    self.apply_prereqs(depends)
-
-            self.apply(thing)
-            ret = True
-        except PatchApplyError:
-            ret = False
-        finally:
-            core.log_end_sec()
-
-        return ret
-
     def _pull_safe(self, pull_url):
         try:
             self.git_pull(pull_url)

ingest_mdir.py

@@ -65,8 +65,6 @@
 tree = Tree(args.tree_name, args.tree_name, args.tree, branch=args.tree_branch)
 if not tree.check_applies(series):
     print("Patch series does not apply cleanly to the tree")
-    if tree.check_applies_with_depends(series):
-        print("woo!")
     os.sys.exit(1)
 
 try:

pw_poller.py

@@ -105,13 +105,8 @@ def _series_determine_tree(self, s: PwSeries) -> str:
 
         if "fixes" in self._trees and netdev.series_is_a_fix_for(s, self._trees["fixes"]):
             s.tree_name = "fixes"
-        elif "for-next" in self._trees:
-            if self._trees["for-next"].check_applies(s):
-                s.tree_name = "for-next"
-            elif self._trees["for-next"].check_applies_with_depends(s):
-                s.tree_name = "for-next"
-                log(f"Target tree - {s.tree_name} (with dependencies)", "")
-                return "Guessed tree name to be for-next, with dependencies"
+        elif "for-next" in self._trees and self._trees["for-next"].check_applies(s):
+            s.tree_name = "for-next"
         elif "master" in self._trees and self._trees["master"].check_applies(s):
             s.tree_name = "master"