print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'
f.close()
- # the editor
- editor = config.get('stgit.editor')
- if editor:
- pass
- elif 'EDITOR' in os.environ:
- editor = os.environ['EDITOR']
- else:
- editor = 'vi'
- editor += ' %s' % fname
-
- print 'Invoking the editor: "%s"...' % editor,
- sys.stdout.flush()
- print 'done (exit code: %d)' % os.system(editor)
+ call_editor(fname)
f = file(fname, 'r+')
self._set_dir(os.path.join(self.__base_dir, 'patches', self.__name))
self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
self.__name)
- self.__base_file = os.path.join(self.__base_dir, 'refs', 'bases',
- self.__name)
self.__applied_file = os.path.join(self._dir(), 'applied')
self.__unapplied_file = os.path.join(self._dir(), 'unapplied')
f.close()
return names
- def get_base_file(self):
- self.__begin_stack_check()
- return self.__base_file
+ def get_base(self):
+ # Return the parent of the bottommost patch, if there is one.
+ if os.path.isfile(self.__applied_file):
+ bottommost = file(self.__applied_file).readline().strip()
+ if bottommost:
+ return self.get_patch(bottommost).get_bottom()
+ # No bottommost patch, so just return HEAD
+ return git.get_head()
+
+ def get_head(self):
+ """Return the head of the branch
+ """
+ crt = self.get_current_patch()
+ if crt:
+ return crt.get_top()
+ else:
+ return self.get_base()
def get_protected(self):
return os.path.isfile(os.path.join(self._dir(), 'protected'))
otherwise."""
return self.patch_applied(name) or self.patch_unapplied(name)
- def __begin_stack_check(self):
- """Save the current HEAD into .git/refs/heads/base if the stack
- is empty
- """
- if len(self.get_applied()) == 0:
- head = git.get_head()
- write_string(self.__base_file, head)
-
- def __end_stack_check(self):
- """Remove .git/refs/heads/base if the stack is empty.
- This warning should never happen
- """
- if len(self.get_applied()) == 0 \
- and read_string(self.__base_file) != git.get_head():
- print 'Warning: stack empty but the HEAD and base are different'
-
def head_top_equal(self):
"""Return true if the head and the top are the same
"""
def init(self, create_at=False, parent_remote=None, parent_branch=None):
"""Initialises the stgit series
"""
- bases_dir = os.path.join(self.__base_dir, 'refs', 'bases')
-
if os.path.exists(self.__patch_dir):
raise StackException, self.__patch_dir + ' already exists'
if os.path.exists(self.__refs_dir):
raise StackException, self.__refs_dir + ' already exists'
- if os.path.exists(self.__base_file):
- raise StackException, self.__base_file + ' already exists'
if (create_at!=False):
git.create_branch(self.__name, create_at)
os.makedirs(self.__patch_dir)
self.set_parent(parent_remote, parent_branch)
-
- create_dirs(bases_dir)
self.create_empty_field('applied')
self.create_empty_field('unapplied')
self.create_empty_field('description')
os.makedirs(os.path.join(self._dir(), 'patches'))
os.makedirs(self.__refs_dir)
- self.__begin_stack_check()
+ self._set_field('orig-base', git.get_head())
def convert(self):
"""Either convert to use a separate patch directory, or
os.rmdir(self.__patch_dir)
print 'done'
else:
- print 'Patch directory %s is not empty.' % self.__name
+ print 'Patch directory %s is not empty.' % self.__patch_dir
self.__patch_dir = self._dir()
if to_stack.is_initialised():
raise StackException, '"%s" already exists' % to_stack.get_branch()
- if os.path.exists(to_stack.__base_file):
- os.remove(to_stack.__base_file)
git.rename_branch(self.__name, to_name)
if os.path.isdir(self._dir()):
rename(os.path.join(self.__base_dir, 'patches'),
self.__name, to_stack.__name)
- if os.path.exists(self.__base_file):
- rename(os.path.join(self.__base_dir, 'refs', 'bases'),
- self.__name, to_stack.__name)
if os.path.exists(self.__refs_dir):
rename(os.path.join(self.__base_dir, 'refs', 'patches'),
self.__name, to_stack.__name)
"""
try:
# allow cloning of branches not under StGIT control
- base = read_string(self.get_base_file())
+ base = self.get_base()
except:
base = git.get_head()
Series(target_series).init(create_at = base)
# fast forward the cloned series to self's top
new_series.forward_patches(applied)
- # Clone remote and merge settings
+ # Clone parent informations
value = config.get('branch.%s.remote' % self.__name)
if value:
config.set('branch.%s.remote' % target_series, value)
if value:
config.set('branch.%s.merge' % target_series, value)
+ value = config.get('branch.%s.stgit.parentbranch' % self.__name)
+ if value:
+ config.set('branch.%s.stgit.parentbranch' % target_series, value)
+
def delete(self, force = False):
"""Deletes an stgit series
"""
os.remove(self.__current_file)
if os.path.exists(self.__descr_file):
os.remove(self.__descr_file)
+ if os.path.exists(self._dir()+'/orig-base'):
+ os.remove(self._dir()+'/orig-base')
+
if not os.listdir(self.__patch_dir):
os.rmdir(self.__patch_dir)
else:
- print 'Patch directory %s is not empty.' % self.__name
- if not os.listdir(self._dir()):
- remove_dirs(os.path.join(self.__base_dir, 'patches'),
- self.__name)
- else:
- print 'Series directory %s is not empty.' % self.__name
- if not os.listdir(self.__refs_dir):
- remove_dirs(os.path.join(self.__base_dir, 'refs', 'patches'),
- self.__name)
- else:
+ print 'Patch directory %s is not empty.' % self.__patch_dir
+
+ try:
+ os.removedirs(self._dir())
+ except OSError:
+ raise StackException, 'Series directory %s is not empty.' % self._dir()
+
+ try:
+ os.removedirs(self.__refs_dir)
+ except OSError:
print 'Refs directory %s is not empty.' % self.__refs_dir
- if os.path.exists(self.__base_file):
- remove_file_and_dirs(
- os.path.join(self.__base_dir, 'refs', 'bases'), self.__name)
+ # Cleanup parent informations
+ # FIXME: should one day make use of git-config --section-remove,
+ # scheduled for 1.5.1
+ config.unset('branch.%s.remote' % self.__name)
+ config.unset('branch.%s.merge' % self.__name)
+ config.unset('branch.%s.stgit.parentbranch' % self.__name)
def refresh_patch(self, files = None, message = None, edit = False,
show_patch = False,
committer_email = patch.get_commemail()
if sign_str:
- descr = '%s\n%s: %s <%s>\n' % (descr.rstrip(), sign_str,
+ descr = descr.rstrip()
+ if descr.find("\nSigned-off-by:") < 0 \
+ and descr.find("\nAcked-by:") < 0:
+ descr = descr + "\n"
+
+ descr = '%s\n%s: %s <%s>\n' % (descr, sign_str,
committer_name, committer_email)
bottom = patch.get_bottom()
head = git.get_head()
- self.__begin_stack_check()
-
patch = Patch(name, self.__patch_dir, self.__refs_dir)
patch.create()
if self.patch_hidden(name):
self.unhide_patch(name)
- self.__begin_stack_check()
-
def forward_patches(self, names):
"""Try to fast-forward an array of patches.
stack. Apply the rest with push_patch
"""
unapplied = self.get_unapplied()
- self.__begin_stack_check()
forwarded = 0
top = git.get_head()
unapplied = self.get_unapplied()
assert(name in unapplied)
- self.__begin_stack_check()
-
patch = Patch(name, self.__patch_dir, self.__refs_dir)
head = git.get_head()
except git.GitException, ex:
print >> sys.stderr, \
'The merge failed during "push". ' \
- 'Use "refresh" after fixing the conflicts'
+ 'Use "refresh" after fixing the conflicts or ' \
+ 'revert the operation with "push --undo".'
append_string(self.__applied_file, name)
else:
self.__set_current(applied[-1])
- self.__end_stack_check()
-
def empty_patch(self, name):
"""Returns True if the patch is empty
"""
~mdw / stgit / blobdiff