tor-browser

commit f8aa62a8e0bca0219dc9b235bf534d4c5d1bb103
parent e212f6811e0be1068bbc4de89de6bdba1ef8d75e
Author: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date:   Fri, 24 Oct 2025 14:35:57 +0000

Bug 1993015 - include preset into fuzzy commit msg, r=marco

Differential Revision: https://phabricator.services.mozilla.com/D269504

Diffstat:
M
tools/tryselect/mach_commands.py
 | 
1
+
M
tools/tryselect/selectors/fuzzy.py
 | 
6
+++++-
M
tools/tryselect/test/test_selectors.py
 | 
14
+++++++-------

3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/tools/tryselect/mach_commands.py b/tools/tryselect/mach_commands.py
@@ -114,6 +114,7 @@ def handle_presets(
         name = preset
         preset = presets(command_context)[name]
         selector = preset.pop("selector")
+        kwargs["preset_id"] = name
         preset.pop("description", None)  # description isn't used by any selectors
 
         if not subcommand:
diff --git a/tools/tryselect/selectors/fuzzy.py b/tools/tryselect/selectors/fuzzy.py
@@ -135,6 +135,7 @@ def run(
     push_to_vcs=False,
     show_chunk_numbers=False,
     new_test_config=False,
+    **kwargs,
 ):
     fzf = fzf_bootstrap(update)
 
@@ -235,7 +236,10 @@ def run(
         return queries
 
     # build commit message
-    msg = "Fuzzy"
+    if "preset_id" in kwargs:
+        msg = "Fuzzy (preset: {})".format(kwargs.get("preset_id"))
+    else:
+        msg = "Fuzzy"
     args = [f"query={q}" for q in queries]
     if test_paths:
         args.append("paths={}".format(":".join(test_paths)))
diff --git a/tools/tryselect/test/test_selectors.py b/tools/tryselect/test/test_selectors.py
@@ -245,7 +245,7 @@ def full_task_set(target_task_set):
                 """
               preset saved, run with: --preset=foo
               Commit message:
-              Fuzzy query='test&query='opt&query='test
+              Fuzzy (preset: foo) query='test&query='opt&query='test
 
               mach try command: `./mach try fuzzy --preset foo -xq 'test`
 
@@ -624,7 +624,7 @@ def full_task_set(target_task_set):
                 """
               preset saved, run with: --preset=foo
               Commit message:
-              Fuzzy query='foo
+              Fuzzy (preset: foo) query='foo
 
               mach try command: `./mach try fuzzy --preset foo`
 
@@ -648,7 +648,7 @@ def full_task_set(target_task_set):
               }
 
               Commit message:
-              Fuzzy query='foo
+              Fuzzy (preset: foo) query='foo
 
               mach try command: `./mach try --preset foo`
 
@@ -693,7 +693,7 @@ def full_task_set(target_task_set):
                 """
               preset saved, run with: --preset=foo
               Commit message:
-              Fuzzy query='foo&query='build
+              Fuzzy (preset: foo) query='foo&query='build
 
               mach try command: `./mach try fuzzy --preset foo -q'build`
 
@@ -718,7 +718,7 @@ def full_task_set(target_task_set):
               }
 
               Commit message:
-              Fuzzy query='foo&query='opt
+              Fuzzy (preset: foo) query='foo&query='opt
 
               mach try command: `./mach try fuzzy --preset foo -xq'opt`
 
@@ -760,7 +760,7 @@ def full_task_set(target_task_set):
                 """
               preset saved, run with: --preset=foo
               Commit message:
-              Fuzzy query='foo
+              Fuzzy (preset: foo) query='foo
 
               mach try command: `./mach try fuzzy --preset foo --gecko-profile-features=nostacksampling,cpu`
 
@@ -810,7 +810,7 @@ def full_task_set(target_task_set):
                 """
               preset saved, run with: --preset=foo
               Commit message:
-              Fuzzy query='foo
+              Fuzzy (preset: foo) query='foo
 
               mach try command: `./mach try fuzzy --preset foo`