Makefile & dev script additions

- Add Check Patches & Set Checkpoint in dev UI
- Add make diff to view git diff of Camoufox source repo

Makefile

@@ -50,11 +50,17 @@ bootstrap: dir
 	(sudo apt-get -y install $(debs) || sudo dnf -y install $(rpms) || sudo pacman -Sy $(pacman))
 	make mozbootstrap
 
+diff:
+	cd $(cf_source_dir) && git diff
+
+checkpoint:
+	cd $(cf_source_dir) && git commit -m "Checkpoint" -a
+
 clean:
 	cd $(cf_source_dir) && git clean -fdx && ./mach clobber
 	make revert
 
-distclean: clean
+distclean:
 	rm -rf $(cf_source_dir)
 
 build:

scripts/developer.py

@@ -48,7 +48,7 @@ def run_patches(reverse=False):
         title = "Patch files"
     selected_patches = easygui.multchoicebox(title, "Patches", patch_files)
     if not selected_patches:
-        exit()
+        return
 
     for patch_file in selected_patches:
         patch(patch_file, reverse=reverse)
@@ -57,6 +57,8 @@ def run_patches(reverse=False):
 # GUI Choicebox with options
 choices = [
     "Reset workspace",
+    "Check patches",
+    "Set checkpoint",
     "Select patches",
     "Reverse patches",
     "Find broken patches",
@@ -65,15 +67,7 @@ choices = [
 ]
 
 """
-GUI Choicebox with the following options:
+GUI Choicebox
-- Reset:
-    `make clean`
-- Patch all BUT:
-    Checklist of *.patch files in ../patches to exclude. The rest gets patched.
-- Find broken:
-    Resets, runs patches, then finds broken patches.
-    If all show good error code, show at the top of the message box "All patches applied successfully"
-    If any show bad error code, show at the top of the message box "Some patches failed to apply", then the rej output
 """
 
 
@@ -83,6 +77,32 @@ def handle_choice(choice):
             reset_camoufox()
             easygui.msgbox("Reset completed and bootstrap patches applied.", "Reset Complete")
 
+        case "Check patches":
+            # Produces a list of patches that are applied
+            apply_dict = {}
+            for patch_file in list_files('../patches', suffix='*.patch'):
+                result = os.system(f'git apply --check "{patch_file}" > /dev/null 2>&1')
+                if result == 0:
+                    apply_dict[patch_file] = 'NOT APPLIED'
+                else:
+                    apply_dict[patch_file] = 'APPLIED'
+            easygui.textbox(
+                "Patching Result",
+                "Patching Result",
+                '\n'.join(
+                    sorted(
+                        (f'{v}\t{os.path.basename(k)[:-6]}' for k, v in apply_dict.items()),
+                        reverse=True,
+                        key=lambda x: x[0],
+                    )
+                ),
+            )
+
+        case "Set checkpoint":
+            with temp_cd('..'):
+                run('make checkpoint')
+            easygui.msgbox("Checkpoint set.", "Checkpoint Set")
+
         case "Select patches":
             run_patches(reverse=False)
             easygui.msgbox("Patching completed.", "Patching Complete")
@@ -131,5 +151,5 @@ def handle_choice(choice):
 if __name__ == "__main__":
     into_camoufox_dir()
 
-    choice = easygui.choicebox("Select an option:", "Camoufox Dev Tools", choices)
+    while choice := easygui.choicebox("Select an option:", "Camoufox Dev Tools", choices):
-    handle_choice(choice)
+        handle_choice(choice)