import sys, os
from stgit.utils import *
-from stgit import git, basedir
+from stgit import git, basedir, templates
from stgit.config import config
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
- elif os.path.isfile(tmpl):
- print >> f, file(tmpl).read().rstrip()
+ elif tmpl:
+ print >> f, tmpl,
else:
print >> f
print >> f, __comment_prefix, comment
append_string(self.__applied_file, patch.get_name())
self.__set_current(name)
+ self.refresh_patch(cache_update = False)
+
def delete_patch(self, name):
"""Deletes a patch
"""
self.pop_patch(name)
return patch.restore_old_boundaries()
- def pop_patch(self, name):
+ def pop_patch(self, name, keep = False):
"""Pops the top patch from the stack
"""
applied = self.get_applied()
patch = Patch(name, self.__patch_dir, self.__refs_dir)
- git.switch(patch.get_bottom())
+ git.switch(patch.get_bottom(), keep)
# save the new applied list
idx = applied.index(name) + 1