|
@@ -2,7 +2,7 @@
|
|
|
# User Ricky Stewart <rstewart@mozilla.com>
|
|
# User Ricky Stewart <rstewart@mozilla.com>
|
|
|
# Date 1597357184 0
|
|
# Date 1597357184 0
|
|
|
# Node ID d2149ac954ff4b18ff278afab848d188e61e23f9
|
|
# Node ID d2149ac954ff4b18ff278afab848d188e61e23f9
|
|
|
-# Parent 602637e1bfdd46c6e260f52dbabe713e95f86ac5
|
|
|
|
|
|
|
+# Parent cf719d9514031678f730c6787be6e13cb5fd98b9
|
|
|
Bug 985141 - Allow mach commands to specify what virtualenv they should use. r=mhentges,dmajor
|
|
Bug 985141 - Allow mach commands to specify what virtualenv they should use. r=mhentges,dmajor
|
|
|
|
|
|
|
|
Now you can pass the `virtualenv_name` kwarg to the `Command` decorator which will configure the `_virtualenv_manager` accordingly.
|
|
Now you can pass the `virtualenv_name` kwarg to the `Command` decorator which will configure the `_virtualenv_manager` accordingly.
|
|
@@ -12,8 +12,8 @@ Differential Revision: https://phabricator.services.mozilla.com/D86256
|
|
|
diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
|
|
diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
|
|
|
--- a/python/mach/mach/decorators.py
|
|
--- a/python/mach/mach/decorators.py
|
|
|
+++ b/python/mach/mach/decorators.py
|
|
+++ b/python/mach/mach/decorators.py
|
|
|
-@@ -13,31 +13,29 @@ except ImportError:
|
|
|
|
|
-
|
|
|
|
|
|
|
+@@ -9,31 +9,29 @@ import collections
|
|
|
|
|
+ import collections.abc
|
|
|
|
|
|
|
|
from .base import MachError
|
|
from .base import MachError
|
|
|
from .registrar import Registrar
|
|
from .registrar import Registrar
|
|
@@ -22,12 +22,11 @@ diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
|
|
|
|
|
|
|
|
class _MachCommand(object):
|
|
class _MachCommand(object):
|
|
|
- """Container for mach command metadata.
|
|
- """Container for mach command metadata.
|
|
|
--
|
|
|
|
|
|
|
++ """Container for mach command metadata."""
|
|
|
|
|
+
|
|
|
- Mach commands contain lots of attributes. This class exists to capture them
|
|
- Mach commands contain lots of attributes. This class exists to capture them
|
|
|
- in a sane way so tuples, etc aren't used instead.
|
|
- in a sane way so tuples, etc aren't used instead.
|
|
|
- """
|
|
- """
|
|
|
-+ """Container for mach command metadata."""
|
|
|
|
|
-+
|
|
|
|
|
__slots__ = (
|
|
__slots__ = (
|
|
|
# Content from decorator arguments to define the command.
|
|
# Content from decorator arguments to define the command.
|
|
|
'name',
|
|
'name',
|
|
@@ -47,7 +46,7 @@ diff --git a/python/mach/mach/decorators.py b/python/mach/mach/decorators.py
|
|
|
# Describes how dispatch is performed.
|
|
# Describes how dispatch is performed.
|
|
|
|
|
|
|
|
# The Python class providing the command. This is the class type not
|
|
# The Python class providing the command. This is the class type not
|
|
|
-@@ -56,25 +54,26 @@ class _MachCommand(object):
|
|
|
|
|
|
|
+@@ -52,25 +50,26 @@ class _MachCommand(object):
|
|
|
|
|
|
|
|
# For subcommands, the global order that the subcommand's declaration
|
|
# For subcommands, the global order that the subcommand's declaration
|
|
|
# was seen.
|
|
# was seen.
|
Frank-Rainer Grahl