Generate unique patch names

[stgit] / stgit / commands / imprt.py

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index cfbf0de..34cbf38 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -85,6 +85,11 @@ def __strip_patch_name(name):
 
     return stripped
 
+def __replace_slashes_with_dashes(name):
+    stripped = name.replace('/', '-')
+
+    return stripped
+
 def __parse_description(descr):
     """Parse the patch description and return the new description and
     author information (if any).
@@ -234,6 +239,9 @@ def __import_patch(patch, filename, options):
         message, author_name, author_email, author_date = \
                  __parse_patch(filename)
 
+    if not patch:
+        patch = make_patch_name(message, crt_series.patch_exists)
+
     # refresh_patch() will invoke the editor in this case, with correct
     # patch content
     if not message:
@@ -294,6 +302,7 @@ def __import_series(filename, options):
 
         if options.strip:
             patch = __strip_patch_name(patch)
+        patch = __replace_slashes_with_dashes(patch);
         if options.ignore and patch in applied:
             print 'Ignoring already applied patch "%s"' % patch
             continue
@@ -323,7 +332,7 @@ def func(parser, options, args):
         elif filename:
             patch = os.path.basename(filename)
         else:
-            raise CmdException, 'Unknown patch name'
+            patch = ''
         if options.strip:
             patch = __strip_patch_name(patch)