Bug 1216950 - Add --list to |mach try| to display saved try strings, r=chmanchester

testing/mach_commands.py

@@ -603,8 +603,12 @@ class PushToTry(MachCommandBase):
 
         print("mach try is under development, please file bugs blocking 1149670.")
 
-        resolver = self._spawn(TestResolver)
-        at = AutoTry(self.topsrcdir, resolver, self._mach_context)
+        resolver_func = lambda: self._spawn(TestResolver)
+        at = AutoTry(self.topsrcdir, resolver_func, self._mach_context)
+
+        if kwargs["list"]:
+            at.list_presets()
+            sys.exit()
 
         if kwargs["load"] is not None:
             defaults = at.load_config(kwargs["load"])

testing/tools/autotry/autotry.py

@@ -38,6 +38,8 @@ def arg_parser():
                         help="Save the command line arguments for future use with --preset.")
     parser.add_argument('--preset', dest="load", action='store',
                         help="Load a saved set of arguments. Additional arguments will override saved ones.")
+    parser.add_argument('--list', action='store_true',
+                        help="List all saved try strings")
     parser.add_argument('extra_args', nargs=argparse.REMAINDER,
                         help='Extra arguments to put in the try push.')
     parser.add_argument('-v', "--verbose", dest='verbose', action='store_true', default=False,
@@ -169,9 +171,10 @@ class AutoTry(object):
         "web-platform-tests": "web-platform-tests",
     }
 
-    def __init__(self, topsrcdir, resolver, mach_context):
+    def __init__(self, topsrcdir, resolver_func, mach_context):
         self.topsrcdir = topsrcdir
-        self.resolver = resolver
+        self._resolver_func = resolver_func
+        self._resolver = None
         self.mach_context = mach_context
 
         if os.path.exists(os.path.join(self.topsrcdir, '.hg')):
@@ -179,6 +182,12 @@ class AutoTry(object):
         else:
             self._use_git = True
 
+    @property
+    def resolver(self):
+        if self._resolver is None:
+            self._resolver = self.resolver_func
+        return self._resolver
+
     @property
     def config_path(self):
         return os.path.join(self.mach_context.state_dir, "autotry.ini")
@@ -198,6 +207,23 @@ class AutoTry(object):
 
         return kwargs
 
+    def list_presets(self):
+        config = ConfigParser.RawConfigParser()
+        success = config.read([self.config_path])
+
+        data = []
+        if success:
+            try:
+                data = config.items("try")
+            except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
+                pass
+
+        if not data:
+            print("No presets found")
+
+        for name, try_string in data:
+            print("%s: %s" % (name, try_string))
+
     def split_try_string(self, data):
         return re.findall(r'(?:\[.*?\]|\S)+', data)