Generate unique patch names

"stg assimilate" was already making sure that automatically generated
patch names were non-empty and unique, by suffixing them with a dash
and a number if necessary. This patch moves that functionality into
the autogeneration function itself, so that all its callers can
benefit from it (and the user can benefit from uniform behavior from
all stgit commands).

As an added bonus, this permits the removal of a number of checks that
would abort with an error if the automatically generated name was
empty.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/assimilate.py b/stgit/commands/assimilate.py
index 08210246b52a907ecac21f30febcdbce2b5a1d23..a8b3bfecac1539d02c4e7b2dd75e0d086fb5486c 100644 (file)
--- a/stgit/commands/assimilate.py
+++ b/stgit/commands/assimilate.py
@@ -73,14 +73,7 @@ def func(parser, options, args):
         return name in name2patch or crt_series.patch_exists(name)
 
     for victim in victims:
         return name in name2patch or crt_series.patch_exists(name)
 
     for victim in victims:

-        patchname = make_patch_name(victim.get_log())
-        if not patchname:
-            patchname = 'patch'
-        if name_taken(patchname):
-            suffix = 0
-            while name_taken('%s-%d' % (patchname, suffix)):
-                suffix += 1
-            patchname = '%s-%d' % (patchname, suffix)
+        patchname = make_patch_name(victim.get_log(), name_taken)

         patch2name[victim] = patchname
         name2patch[patchname] = victim
 
         patch2name[victim] = patchname
         name2patch[patchname] = victim
 

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 0e1bb4463b528dc47e5da8b8423060002f0fa996..d98671126d51b678153f5edfafa743639e4cffd6 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -284,7 +284,7 @@ def name_email_date(address):
 
     return str_list[0]
 
 
     return str_list[0]
 

-def make_patch_name(msg):
+def patch_name_from_msg(msg):

     """Return a string to be used as a patch name. This is generated
     from the first 30 characters of the top line of the string passed
     as argument."""
     """Return a string to be used as a patch name. This is generated
     from the first 30 characters of the top line of the string passed
     as argument."""


@@ -293,3 +293,17 @@ def make_patch_name(msg):
 
     subject_line = msg[:30].lstrip().split('\n', 1)[0].lower()
     return re.sub('[\W]+', '-', subject_line).strip('-')
 
     subject_line = msg[:30].lstrip().split('\n', 1)[0].lower()
     return re.sub('[\W]+', '-', subject_line).strip('-')

+
+def make_patch_name(msg, unacceptable, default_name = 'patch'):
+    """Return a patch name generated from the given commit message,
+    guaranteed to make unacceptable(name) be false. If the commit
+    message is empty, base the name on default_name instead."""
+    patchname = patch_name_from_msg(msg)
+    if not patchname:
+        patchname = 'patch'
+    if unacceptable(patchname):
+        suffix = 0
+        while unacceptable('%s-%d' % (patchname, suffix)):
+            suffix += 1
+        patchname = '%s-%d' % (patchname, suffix)
+    return patchname

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index c8cf42b44e675d5c208d480bef1afe53d90627c9..34cbf383a07d2e83b9c39ef32822920ce245a327 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -240,9 +240,7 @@ def __import_patch(patch, filename, options):
                  __parse_patch(filename)
 
     if not patch:
                  __parse_patch(filename)
 
     if not patch:

-        patch = make_patch_name(message)
-        if not patch:
-            raise CmdException, 'Unknown patch name'
+        patch = make_patch_name(message, crt_series.patch_exists)

 
     # refresh_patch() will invoke the editor in this case, with correct
     # patch content
 
     # refresh_patch() will invoke the editor in this case, with correct
     # patch content

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index f8f357731157d835ece4cf0810dd18efe1b4eb79..996e7898d3ae3d1e7ecb0df7b2494aeab34c7361 100644 (file)
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -71,9 +71,7 @@ def func(parser, options, args):
         elif len(patch_branch) == 2:
             patch = patch_branch[0]
         else:
         elif len(patch_branch) == 2:
             patch = patch_branch[0]
         else:

-            patch = make_patch_name(commit.get_log())
-            if not patch:
-                raise CmdException, 'Unknown patch name'
+            patch = make_patch_name(commit.get_log(), crt_series.patch_exists)

 
     if options.parent:
         parent = git_id(options.parent)
 
     if options.parent:
         parent = git_id(options.parent)

diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py
index 45a20878d7abc4ec885b959a318498995a8bf989..9798f1974b485987166d57b6276a0e172109887a 100644 (file)
--- a/stgit/commands/uncommit.py
+++ b/stgit/commands/uncommit.py
@@ -97,9 +97,8 @@ def func(parser, options, args):
         if patchnames:
             patchname = patchnames[n]
         else:
         if patchnames:
             patchname = patchnames[n]
         else:

-            patchname = make_patch_name(commit.get_log())
-        if not patchname:
-            raise CmdException, 'Unknown patch name for commit %s' % commit_id
+            patchname = make_patch_name(commit.get_log(),
+                                        crt_series.patch_exists)

 
         crt_series.new_patch(patchname,
                              can_edit = False, before_existing = True,
 
         crt_series.new_patch(patchname,
                              can_edit = False, before_existing = True,