This patch converts the sink command to use stgit.lib. The behaviour
is also changed slightly so that it only allows to sink a set of
patches if there are applied once, otherwise it is equivalent to a
push. The new implementation also allows to bring a patch forward
towards the top based on the --to argument.
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxxxx>
---
Before the final patch, I need to write a better test script.
I'm not sure about the conflict resolution. In this implementation, if
a conflict happens, the transaction is aborted. In case we allow
conflicts, I have to dig further on how to implement it with the new
transaction mechanism (I think "delete" does this).
An additional point - the transaction object supports functions like
pop_patches and push_patch. Should we change them for consistency and
simplicity? I.e., apart from current pop_patches with predicate add
functions that support popping a list or a single patch. The same goes
for push_patch.
stgit/commands/sink.py | 79 ++++++++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index d8f79b4..cb94f99 100644
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -16,13 +16,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os
-from optparse import OptionParser, make_option
-
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import stack, git
+from optparse import make_option
+from stgit.commands import common
+from stgit.lib import transaction
help = 'send patches deeper down the stack'
usage = """%prog [-t <target patch>] [-n] [<patches>]
@@ -32,7 +29,7 @@ push the specified <patches> (the current patch by default), and
then push back into place the formerly-applied patches (unless -n
is also given)."""
-directory = DirectoryGotoToplevel()
+directory = common.DirectoryHasRepositoryLib()
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after sinking',
action = 'store_true'),
@@ -42,33 +39,55 @@ options = [make_option('-n', '--nopush',
def func(parser, options, args):
"""Sink patches down the stack.
"""
+ stack = directory.repository.current_stack
- check_local_changes()
- check_conflicts()
- check_head_top_equal(crt_series)
-
- oldapplied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
- all = unapplied + oldapplied
-
- if options.to and not options.to in oldapplied:
- raise CmdException('Cannot sink below %s, since it is not applied'
- % options.to)
+ if not stack.patchorder.applied:
+ raise common.CmdException('No patches applied')
+ if options.to and not options.to in stack.patchorder.applied:
+ raise common.CmdException('Cannot sink below %s since it is not applied'
+ % options.to)
if len(args) > 0:
- patches = parse_patches(args, all)
+ patches = common.parse_patches(args, stack.patchorder.all)
else:
- current = crt_series.get_current()
- if not current:
- raise CmdException('No patch applied')
- patches = [current]
+ # current patch
+ patches = stack.patchorder.applied[-1:]
+
+ if not patches:
+ raise common.CmdException('No patches to sink')
+ if options.to and options.to in patches:
+ raise common.CmdException('Cannot have a sinked patch as target')
+
+ trans = transaction.StackTransaction(stack, 'sink')
+
+ # pop any patches to be sinked in case they are applied
+ to_push = trans.pop_patches(lambda pn: pn in patches)
+
+ if options.to:
+ if options.to in to_push:
+ # this is the case where sinking actually brings some
+ # patches forward
+ for p in to_push:
+ if p == options.to:
+ del to_push[:to_push.index(p)]
+ break
+ trans.push_patch(p)
+ else:
+ # target patch below patches to be sinked
+ to_pop = trans.applied[trans.applied.index(options.to):]
+ to_push = to_pop + to_push
+ trans.pop_patches(lambda pn: pn in to_pop)
+ else:
+ # pop all the remaining patches
+ to_push = trans.applied + to_push
+ trans.pop_patches(lambda pn: True)
- if oldapplied:
- crt_series.pop_patch(options.to or oldapplied[0])
- push_patches(crt_series, patches)
+ # push the sinked patches
+ for p in patches:
+ trans.push_patch(p)
if not options.nopush:
- newapplied = crt_series.get_applied()
- def not_reapplied_yet(p):
- return not p in newapplied
- push_patches(crt_series, filter(not_reapplied_yet, oldapplied))
+ for p in to_push:
+ trans.push_patch(p)
+
+ trans.run()
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
