Enable feature branch customization for merge_up()

Author: xolox

vcs_repo_mgr/__init__.py

@@ -109,7 +109,7 @@
 )
 
 # Semi-standard module versioning.
-__version__ = '0.31'
+__version__ = '0.32'
 
 USER_CONFIG_FILE = os.path.expanduser('~/.vcs-repo-mgr.ini')
 """The absolute pathname of the user-specific configuration file (a string)."""
@@ -136,6 +136,23 @@
 loaded_repositories = {}
 
 
+def coerce_feature_branch(value):
+    """
+    Convert a string to a :class:`FeatureBranchSpec` object.
+
+    :param value: A string or :class:`FeatureBranchSpec` object.
+    :returns: A :class:`FeatureBranchSpec` object.
+    """
+    # Repository objects pass through untouched.
+    if isinstance(value, FeatureBranchSpec):
+        return value
+    # We expect a string with a name or URL.
+    if not isinstance(value, string_types):
+        msg = "Expected string or FeatureBranchSpec object as argument, got %s instead!"
+        raise ValueError(msg % type(value))
+    return FeatureBranchSpec(value)
+
+
 def coerce_repository(value):
     """
     Convert a string (taken to be a repository name or location) to a :class:`Repository` object.
@@ -968,9 +985,8 @@ def merge_up(self, target_branch=None, feature_branch=None, delete=True):
                               the feature branch starts (a string or
                               :data:`None`, defaults to
                               :attr:`current_branch`).
-        :param feature_branch: The feature branch to merge in (a string or
-                               :data:`None`). Strings are parsed using
-                               :class:`FeatureBranchSpec`.
+        :param feature_branch: The feature branch to merge in (any value
+                               accepted by :func:`coerce_feature_branch()`).
         :param delete: :data:`True` (the default) to delete or close the
                        feature branch after it is merged, :data:`False`
                        otherwise.
@@ -998,7 +1014,7 @@ def merge_up(self, target_branch=None, feature_branch=None, delete=True):
             if not target_branch:
                 raise TypeError("You need to specify the target branch! (where merging starts)")
         # Parse the feature branch specification.
-        feature_branch = FeatureBranchSpec(feature_branch) if feature_branch else None
+        feature_branch = coerce_feature_branch(feature_branch) if feature_branch else None
         # Make sure we start with a clean working tree.
         self.ensure_clean()
         # Make sure we're up to date with our upstream repository (if any).