Add --template option to export

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 30c4b939d5cbd5927b094376fa6536d2a1bead2f..5b7e9d6315e45a2d01542149c316933d887e94d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-11  Catalin Marinas  <catalin.marinas@gmail.com>
+
+       * stgit/main.py (export): Add --template option to use a different
+       file as the export template rather than the default one
+

 2005-07-09  Catalin Marinas  <catalin.marinas@gmail.com>
 
        * Release 0.4
 2005-07-09  Catalin Marinas  <catalin.marinas@gmail.com>
 
        * Release 0.4

diff --git a/stgit/main.py b/stgit/main.py
index 16d58a922b6d5b8511fb09078ac0e1fda04129f4..d93f2eb412777085f918f9dd3434962ecb73febc 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -684,7 +684,10 @@ def export(parser, options, args):
         print >> series, pname
 
         # get the template
         print >> series, pname
 
         # get the template

-        patch_tmpl = os.path.join(git.base_dir, 'patchexport.tmpl')
+        if options.template:
+            patch_tmpl = options.template
+        else:
+            patch_tmpl = os.path.join(git.base_dir, 'patchexport.tmpl')

         if os.path.isfile(patch_tmpl):
             tmpl = file(patch_tmpl).read()
         else:
         if os.path.isfile(patch_tmpl):
             tmpl = file(patch_tmpl).read()
         else:


@@ -734,7 +737,9 @@ export_cmd = \
                                 action = 'store_true'),
                     make_option('-d', '--diff',
                                 help = 'append .diff to the patch names',
                                 action = 'store_true'),
                     make_option('-d', '--diff',
                                 help = 'append .diff to the patch names',

-                                action = 'store_true')])
+                                action = 'store_true'),
+                    make_option('-t', '--template', metavar = 'FILE',
+                                help = 'Use FILE as a template')])

 
 #
 # The commands map
 
 #
 # The commands map