Add a --parent flag to "stgit pick".

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index 0217a7fbe06b6dae47992a787f5f6b6061bb35a7..618182c6a5106e44b0a6e8cef4b2580446635b5c 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 import sys, os
 
 from stgit.utils import *
 import sys, os
 
 from stgit.utils import *

-from stgit import git, basedir
+from stgit import git, basedir, templates

 from stgit.config import config
 
 
 from stgit.config import config
 
 


@@ -65,14 +65,14 @@ def __clean_comments(f):
     f.writelines(lines)
 
 def edit_file(series, line, comment, show_patch = True):
     f.writelines(lines)
 
 def edit_file(series, line, comment, show_patch = True):

-    fname = '.stgit.msg'
-    tmpl = os.path.join(basedir.get(), 'patchdescr.tmpl')
+    fname = '.stgitmsg.txt'
+    tmpl = templates.get_template('patchdescr.tmpl')

 
     f = file(fname, 'w+')
     if line:
         print >> f, line
 
     f = file(fname, 'w+')
     if line:
         print >> f, line

-    elif os.path.isfile(tmpl):
-        print >> f, file(tmpl).read().rstrip()
+    elif tmpl:
+        print >> f, tmpl,

     else:
         print >> f
     print >> f, __comment_prefix, comment
     else:
         print >> f
     print >> f, __comment_prefix, comment