From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Thu, 2 Nov 2006 21:18:31 +0000 (+0000)
Subject: Stgit: allow importing series files where patch names include slashes
X-Git-Tag: v0.14.3~443
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/613a2f163a1c2185eb03f1d9e8504e8fd737a4a4

Stgit: allow importing series files where patch names include slashes

Do that by converting slashes in patch name to dashes. Actually one could think
that different quilt folders relate to topic branches, but I do not see an
obviously correct mapping nor users which would do that.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 1b7dce8..c8cf42b 100644
--- 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).
@@ -299,6 +304,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