chiark - git - mdw - stgit/blob - stgit/lib/transaction.py

   1 from stgit import exception
   2 from stgit.out import *
   3 from stgit.lib import git
   4
   5 class TransactionException(exception.StgException):
   6     pass
   7
   8 class TransactionHalted(TransactionException):
   9     pass
  10
  11 def _print_current_patch(old_applied, new_applied):
  12     def now_at(pn):
  13         out.info('Now at patch "%s"' % pn)
  14     if not old_applied and not new_applied:
  15         pass
  16     elif not old_applied:
  17         now_at(new_applied[-1])
  18     elif not new_applied:
  19         out.info('No patch applied')
  20     elif old_applied[-1] == new_applied[-1]:
  21         pass
  22     else:
  23         now_at(new_applied[-1])
  24
  25 class _TransPatchMap(dict):
  26     def __init__(self, stack):
  27         dict.__init__(self)
  28         self.__stack = stack
  29     def __getitem__(self, pn):
  30         try:
  31             return dict.__getitem__(self, pn)
  32         except KeyError:
  33             return self.__stack.patches.get(pn).commit
  34
  35 class StackTransaction(object):
  36     def __init__(self, stack, msg):
  37         self.__stack = stack
  38         self.__msg = msg
  39         self.__patches = _TransPatchMap(stack)
  40         self.__applied = list(self.__stack.patchorder.applied)
  41         self.__unapplied = list(self.__stack.patchorder.unapplied)
  42         self.__error = None
  43         self.__current_tree = self.__stack.head.data.tree
  44     stack = property(lambda self: self.__stack)
  45     patches = property(lambda self: self.__patches)
  46     def __set_applied(self, val):
  47         self.__applied = list(val)
  48     applied = property(lambda self: self.__applied, __set_applied)
  49     def __set_unapplied(self, val):
  50         self.__unapplied = list(val)
  51     unapplied = property(lambda self: self.__unapplied, __set_unapplied)
  52     def __checkout(self, tree, iw):
  53         if not self.__stack.head_top_equal():
  54             out.error(
  55                 'HEAD and top are not the same.',
  56                 'This can happen if you modify a branch with git.',
  57                 '"stg repair --help" explains more about what to do next.')
  58             self.__abort()
  59         if self.__current_tree != tree:
  60             assert iw != None
  61             iw.checkout(self.__current_tree, tree)
  62             self.__current_tree = tree
  63     @staticmethod
  64     def __abort():
  65         raise TransactionException(
  66             'Command aborted (all changes rolled back)')
  67     def __check_consistency(self):
  68         remaining = set(self.__applied + self.__unapplied)
  69         for pn, commit in self.__patches.iteritems():
  70             if commit == None:
  71                 assert self.__stack.patches.exists(pn)
  72             else:
  73                 assert pn in remaining
  74     @property
  75     def __head(self):
  76         if self.__applied:
  77             return self.__patches[self.__applied[-1]]
  78         else:
  79             return self.__stack.base
  80     def run(self, iw = None):
  81         self.__check_consistency()
  82         new_head = self.__head
  83
  84         # Set branch head.
  85         try:
  86             self.__checkout(new_head.data.tree, iw)
  87         except git.CheckoutException:
  88             # We have to abort the transaction. The only state we need
  89             # to restore is index+worktree.
  90             self.__checkout(self.__stack.head.data.tree, iw)
  91             self.__abort()
  92         self.__stack.set_head(new_head, self.__msg)
  93
  94         if self.__error:
  95             out.error(self.__error)
  96
  97         # Write patches.
  98         for pn, commit in self.__patches.iteritems():
  99             if self.__stack.patches.exists(pn):
 100                 p = self.__stack.patches.get(pn)
 101                 if commit == None:
 102                     p.delete()
 103                 else:
 104                     p.set_commit(commit, self.__msg)
 105             else:
 106                 self.__stack.patches.new(pn, commit, self.__msg)
 107         _print_current_patch(self.__stack.patchorder.applied, self.__applied)
 108         self.__stack.patchorder.applied = self.__applied
 109         self.__stack.patchorder.unapplied = self.__unapplied
 110
 111     def __halt(self, msg):
 112         self.__error = msg
 113         raise TransactionHalted(msg)
 114
 115     @staticmethod
 116     def __print_popped(popped):
 117         if len(popped) == 0:
 118             pass
 119         elif len(popped) == 1:
 120             out.info('Popped %s' % popped[0])
 121         else:
 122             out.info('Popped %s -- %s' % (popped[-1], popped[0]))
 123
 124     def pop_patches(self, p):
 125         """Pop all patches pn for which p(pn) is true. Return the list of
 126         other patches that had to be popped to accomplish this."""
 127         popped = []
 128         for i in xrange(len(self.applied)):
 129             if p(self.applied[i]):
 130                 popped = self.applied[i:]
 131                 del self.applied[i:]
 132                 break
 133         popped1 = [pn for pn in popped if not p(pn)]
 134         popped2 = [pn for pn in popped if p(pn)]
 135         self.unapplied = popped1 + popped2 + self.unapplied
 136         self.__print_popped(popped)
 137         return popped1
 138
 139     def delete_patches(self, p):
 140         """Delete all patches pn for which p(pn) is true. Return the list of
 141         other patches that had to be popped to accomplish this."""
 142         popped = []
 143         all_patches = self.applied + self.unapplied
 144         for i in xrange(len(self.applied)):
 145             if p(self.applied[i]):
 146                 popped = self.applied[i:]
 147                 del self.applied[i:]
 148                 break
 149         popped = [pn for pn in popped if not p(pn)]
 150         self.unapplied = popped + [pn for pn in self.unapplied if not p(pn)]
 151         self.__print_popped(popped)
 152         for pn in all_patches:
 153             if p(pn):
 154                 s = ['', ' (empty)'][self.patches[pn].data.is_nochange()]
 155                 self.patches[pn] = None
 156                 out.info('Deleted %s%s' % (pn, s))
 157         return popped
 158
 159     def push_patch(self, pn, iw = None):
 160         """Attempt to push the named patch. If this results in conflicts,
 161         halts the transaction. If index+worktree are given, spill any
 162         conflicts to them."""
 163         i = self.unapplied.index(pn)
 164         cd = self.patches[pn].data
 165         s = ['', ' (empty)'][cd.is_nochange()]
 166         oldparent = cd.parent
 167         cd = cd.set_parent(self.__head)
 168         base = oldparent.data.tree
 169         ours = cd.parent.data.tree
 170         theirs = cd.tree
 171         tree = self.__stack.repository.simple_merge(base, ours, theirs)
 172         merge_conflict = False
 173         if not tree:
 174             if iw == None:
 175                 self.__halt('%s does not apply cleanly' % pn)
 176             try:
 177                 self.__checkout(ours, iw)
 178             except git.CheckoutException:
 179                 self.__halt('Index/worktree dirty')
 180             try:
 181                 iw.merge(base, ours, theirs)
 182                 tree = iw.index.write_tree()
 183                 self.__current_tree = tree
 184                 s = ' (modified)'
 185             except git.MergeException:
 186                 tree = ours
 187                 merge_conflict = True
 188                 s = ' (conflict)'
 189         cd = cd.set_tree(tree)
 190         self.patches[pn] = self.__stack.repository.commit(cd)
 191         del self.unapplied[i]
 192         self.applied.append(pn)
 193         out.info('Pushed %s%s' % (pn, s))
 194         if merge_conflict:
 195             self.__halt('Merge conflict')