blob: 4d7214e94a67c1eb2dbf84bb2116bc00719caf8b [file] [log] [blame]
"""The L{StackTransaction} class makes it possible to make complex
updates to an StGit stack in a safe and convenient way."""
import atexit
import itertools as it
from stgit import exception, utils
from stgit.utils import any, all
from stgit.out import *
from stgit.lib import git, log
from stgit.config import config
class TransactionException(exception.StgException):
"""Exception raised when something goes wrong with a
class TransactionHalted(TransactionException):
"""Exception raised when a L{StackTransaction} stops part-way through.
Used to make a non-local jump from the transaction setup to the
part of the transaction code where the transaction is run."""
def _print_current_patch(old_applied, new_applied):
def now_at(pn):'Now at patch "%s"' % pn)
if not old_applied and not new_applied:
elif not old_applied:
elif not new_applied:'No patch applied')
elif old_applied[-1] == new_applied[-1]:
class _TransPatchMap(dict):
"""Maps patch names to Commit objects."""
def __init__(self, stack):
self.__stack = stack
def __getitem__(self, pn):
return dict.__getitem__(self, pn)
except KeyError:
return self.__stack.patches.get(pn).commit
class StackTransaction(object):
"""A stack transaction, used for making complex updates to an StGit
stack in one single operation that will either succeed or fail
The basic theory of operation is the following:
1. Create a transaction object.
2. Inside a::
except TransactionHalted:
block, update the transaction with e.g. methods like
L{pop_patches} and L{push_patch}. This may create new git
objects such as commits, but will not write any refs; this means
that in case of a fatal error we can just walk away, no clean-up
(Some operations may need to touch your index and working tree,
though. But they are cleaned up when needed.)
3. After the C{try} block -- wheher or not the setup ran to
completion or halted part-way through by raising a
L{TransactionHalted} exception -- call the transaction's L{run}
method. This will either succeed in writing the updated state to
your refs and index+worktree, or fail without having done
def __init__(self, stack, msg, discard_changes = False,
allow_conflicts = False, allow_bad_head = False,
check_clean_iw = None):
"""Create a new L{StackTransaction}.
@param discard_changes: Discard any changes in index+worktree
@type discard_changes: bool
@param allow_conflicts: Whether to allow pre-existing conflicts
@type allow_conflicts: bool or function of L{StackTransaction}"""
self.__stack = stack
self.__msg = msg
self.__patches = _TransPatchMap(stack)
self.__applied = list(self.__stack.patchorder.applied)
self.__unapplied = list(self.__stack.patchorder.unapplied)
self.__hidden = list(self.__stack.patchorder.hidden)
self.__error = None
self.__current_tree =
self.__base = self.__stack.base
self.__discard_changes = discard_changes
self.__bad_head = None
self.__conflicts = None
if isinstance(allow_conflicts, bool):
self.__allow_conflicts = lambda trans: allow_conflicts
self.__allow_conflicts = allow_conflicts
self.__temp_index = self.temp_index_tree = None
if not allow_bad_head:
if check_clean_iw:
stack = property(lambda self: self.__stack)
patches = property(lambda self: self.__patches)
def __set_applied(self, val):
self.__applied = list(val)
applied = property(lambda self: self.__applied, __set_applied)
def __set_unapplied(self, val):
self.__unapplied = list(val)
unapplied = property(lambda self: self.__unapplied, __set_unapplied)
def __set_hidden(self, val):
self.__hidden = list(val)
hidden = property(lambda self: self.__hidden, __set_hidden)
all_patches = property(lambda self: (self.__applied + self.__unapplied
+ self.__hidden))
def __set_base(self, val):
assert (not self.__applied
or self.patches[self.applied[0]].data.parent == val)
self.__base = val
base = property(lambda self: self.__base, __set_base)
def temp_index(self):
if not self.__temp_index:
self.__temp_index = self.__stack.repository.temp_index()
return self.__temp_index
def top(self):
if self.__applied:
return self.__patches[self.__applied[-1]]
return self.__base
def __get_head(self):
if self.__bad_head:
return self.__bad_head
def __set_head(self, val):
self.__bad_head = val
head = property(__get_head, __set_head)
def __assert_head_top_equal(self):
if not self.__stack.head_top_equal():
'HEAD and top are not the same.',
'This can happen if you modify a branch with git.',
'"stg repair --help" explains more about what to do next.')
def __assert_index_worktree_clean(self, iw):
if not iw.worktree_clean():
self.__halt('Worktree not clean. Use "refresh" or "reset --hard"')
if not iw.index.is_clean(self.stack.head):
self.__halt('Index not clean. Use "refresh" or "reset --hard"')
def __checkout(self, tree, iw, allow_bad_head):
if not allow_bad_head:
if self.__current_tree == tree and not self.__discard_changes:
# No tree change, but we still want to make sure that
# there are no unresolved conflicts. Conflicts
# conceptually "belong" to the topmost patch, and just
# carrying them along to another patch is confusing.
if (self.__allow_conflicts(self) or iw == None
or not iw.index.conflicts()):
out.error('Need to resolve conflicts first')
assert iw != None
if self.__discard_changes:
iw.checkout(self.__current_tree, tree)
self.__current_tree = tree
def __abort():
raise TransactionException(
'Command aborted (all changes rolled back)')
def __check_consistency(self):
remaining = set(self.all_patches)
for pn, commit in self.__patches.iteritems():
if commit == None:
assert self.__stack.patches.exists(pn)
assert pn in remaining
def abort(self, iw = None):
# The only state we need to restore is index+worktree.
if iw:
self.__checkout(, iw,
allow_bad_head = True)
def run(self, iw = None, set_head = True, allow_bad_head = False,
print_current_patch = True):
"""Execute the transaction. Will either succeed, or fail (with an
exception) and do nothing."""
new_head = self.head
# Set branch head.
if set_head:
if iw:
self.__checkout(, iw, allow_bad_head)
except git.CheckoutException:
# We have to abort the transaction.
self.__stack.set_head(new_head, self.__msg)
if self.__error:
if self.__conflicts:
out.error(*([self.__error] + self.__conflicts))
# Write patches.
def write(msg):
for pn, commit in self.__patches.iteritems():
if self.__stack.patches.exists(pn):
p = self.__stack.patches.get(pn)
if commit == None:
p.set_commit(commit, msg)
else:, commit, msg)
self.__stack.patchorder.applied = self.__applied
self.__stack.patchorder.unapplied = self.__unapplied
self.__stack.patchorder.hidden = self.__hidden
log.log_entry(self.__stack, msg)
old_applied = self.__stack.patchorder.applied
if not self.__conflicts:
write(self.__msg + ' (CONFLICT)')
if print_current_patch:
_print_current_patch(old_applied, self.__applied)
if self.__error:
return utils.STGIT_CONFLICT
return utils.STGIT_SUCCESS
def __halt(self, msg):
self.__error = msg
raise TransactionHalted(msg)
def __print_popped(popped):
if len(popped) == 0:
elif len(popped) == 1:'Popped %s' % popped[0])
else:'Popped %s -- %s' % (popped[-1], popped[0]))
def pop_patches(self, p):
"""Pop all patches pn for which p(pn) is true. Return the list of
other patches that had to be popped to accomplish this. Always
popped = []
for i in xrange(len(self.applied)):
if p(self.applied[i]):
popped = self.applied[i:]
del self.applied[i:]
popped1 = [pn for pn in popped if not p(pn)]
popped2 = [pn for pn in popped if p(pn)]
self.unapplied = popped1 + popped2 + self.unapplied
return popped1
def delete_patches(self, p, quiet = False):
"""Delete all patches pn for which p(pn) is true. Return the list of
other patches that had to be popped to accomplish this. Always
popped = []
all_patches = self.applied + self.unapplied + self.hidden
for i in xrange(len(self.applied)):
if p(self.applied[i]):
popped = self.applied[i:]
del self.applied[i:]
popped = [pn for pn in popped if not p(pn)]
self.unapplied = popped + [pn for pn in self.unapplied if not p(pn)]
self.hidden = [pn for pn in self.hidden if not p(pn)]
for pn in all_patches:
if p(pn):
s = ['', ' (empty)'][self.patches[pn].data.is_nochange()]
self.patches[pn] = None
if not quiet:'Deleted %s%s' % (pn, s))
return popped
def push_patch(self, pn, iw = None, allow_interactive = False,
already_merged = False):
"""Attempt to push the named patch. If this results in conflicts,
halts the transaction. If index+worktree are given, spill any
conflicts to them."""
out.start('Pushing patch "%s"' % pn)
orig_cd = self.patches[pn].data
cd = orig_cd.set_committer(None)
oldparent = cd.parent
cd = cd.set_parent(
if already_merged:
# the resulting patch is empty
tree =
base =
ours =
theirs = cd.tree
tree, self.temp_index_tree = self.temp_index.merge(
base, ours, theirs, self.temp_index_tree)
s = ''
merge_conflict = False
if not tree:
if iw == None:
self.__halt('%s does not apply cleanly' % pn)
self.__checkout(ours, iw, allow_bad_head = False)
except git.CheckoutException:
self.__halt('Index/worktree dirty')
interactive = (allow_interactive and
config.get('stgit.autoimerge') == 'yes')
iw.merge(base, ours, theirs, interactive = interactive)
tree = iw.index.write_tree()
self.__current_tree = tree
s = 'modified'
except git.MergeConflictException, e:
tree = ours
merge_conflict = True
self.__conflicts = e.conflicts
s = 'conflict'
except git.MergeException, e:
cd = cd.set_tree(tree)
if any(getattr(cd, a) != getattr(orig_cd, a) for a in
['parent', 'tree', 'author', 'message']):
comm = self.__stack.repository.commit(cd)
if merge_conflict:
# When we produce a conflict, we'll run the update()
# function defined below _after_ having done the
# checkout in run(). To make sure that we check out
# the real stack top (as it will look after update()
# has been run), set it hard here.
self.head = comm
comm = None
s = 'unmodified'
if already_merged:
s = 'merged'
elif not merge_conflict and cd.is_nochange():
s = 'empty'
if merge_conflict:
# We've just caused conflicts, so we must allow them in
# the final checkout.
self.__allow_conflicts = lambda trans: True
# Update the stack state
if comm:
self.patches[pn] = comm
if pn in self.hidden:
x = self.hidden
x = self.unapplied
del x[x.index(pn)]
if merge_conflict:
self.__halt("%d merge conflict(s)" % len(self.__conflicts))
def push_tree(self, pn):
"""Push the named patch without updating its tree."""
orig_cd = self.patches[pn].data
cd = orig_cd.set_committer(None).set_parent(
s = ''
if any(getattr(cd, a) != getattr(orig_cd, a) for a in
['parent', 'tree', 'author', 'message']):
self.patches[pn] = self.__stack.repository.commit(cd)
s = ' (unmodified)'
if cd.is_nochange():
s = ' (empty)''Pushed %s%s' % (pn, s))
if pn in self.hidden:
x = self.hidden
x = self.unapplied
del x[x.index(pn)]
def reorder_patches(self, applied, unapplied, hidden = None, iw = None,
allow_interactive = False):
"""Push and pop patches to attain the given ordering."""
if hidden is None:
hidden = self.hidden
common = len(list(it.takewhile(lambda (a, b): a == b,
zip(self.applied, applied))))
to_pop = set(self.applied[common:])
self.pop_patches(lambda pn: pn in to_pop)
for pn in applied[common:]:
self.push_patch(pn, iw, allow_interactive = allow_interactive)
# We only get here if all the pushes succeeded.
assert self.applied == applied
assert set(self.unapplied + self.hidden) == set(unapplied + hidden)
self.unapplied = unapplied
self.hidden = hidden
def check_merged(self, patches, tree = None, quiet = False):
"""Return a subset of patches already merged."""
if not quiet:
out.start('Checking for patches merged upstream')
merged = []
if tree:
self.temp_index_tree = tree
elif self.temp_index_tree !=
self.temp_index_tree =
for pn in reversed(patches):
# check whether patch changes can be reversed in the current index
cd = self.patches[pn].data
if cd.is_nochange():
quiet = True)
# The self.temp_index was modified by apply_treediff() so
# force read_tree() the next time merge() is used.
self.temp_index_tree = None
except git.MergeException:
if not quiet:
out.done('%d found' % len(merged))
return merged