Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxxxx>
---
stgit/commands/sink.py | 86 +++++++++++++++++++++---------------------------
t/t1501-sink.sh | 2 +
2 files changed, 39 insertions(+), 49 deletions(-)
diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index d4561ed..8b17fd1 100644
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -16,11 +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 stgit.argparse import opt
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import argparse, stack, git
+from stgit.commands import common
+from stgit.lib import transaction
+from stgit import argparse
help = 'Send patches deeper down the stack'
kind = 'stack'
@@ -51,57 +50,48 @@ options = [
opt('-t', '--to', metavar = 'TARGET', args = [argparse.applied_patches],
short = 'Sink patches below the TARGET patch', long = """
Specify a target patch to place the patches below, instead of
- sinking them to the bottom of the stack.""")]
+ sinking them to the bottom of the stack.""")
+ ] + argparse.keep_option()
-directory = DirectoryGotoToplevel(log = True)
+directory = common.DirectoryHasRepositoryLib()
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)
+ 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)
- oldapplied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
- all = oldapplied + unapplied
+ if len(args) > 0:
+ patches = common.parse_patches(args, stack.patchorder.all)
+ else:
+ # current patch
+ patches = list(stack.patchorder.applied[-1:])
- if options.to and not options.to in oldapplied:
- raise CmdException('Cannot sink below %s, since it is not applied'
- % options.to)
+ 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')
- if len(args) > 0:
- patches = parse_patches(args, all)
+ applied = [p for p in stack.patchorder.applied if p not in patches]
+ if options.to:
+ insert_idx = applied.index(options.to)
else:
- current = crt_series.get_current()
- if not current:
- raise CmdException('No patch applied')
- patches = [current]
-
- before_patches = after_patches = []
-
- # pop necessary patches
- if oldapplied:
- if options.to:
- pop_idx = oldapplied.index(options.to)
- else:
- pop_idx = 0
- after_patches = [p for p in oldapplied[pop_idx:] if p not in patches]
-
- # find the deepest patch to pop
- sink_applied = [p for p in oldapplied if p in patches]
- if sink_applied:
- sinked_idx = oldapplied.index(sink_applied[0])
- if sinked_idx < pop_idx:
- # this is the case where sink brings patches forward
- before_patches = [p for p in oldapplied[sinked_idx:pop_idx]
- if p not in patches]
- pop_idx = sinked_idx
-
- crt_series.pop_patch(oldapplied[pop_idx])
-
- push_patches(crt_series, before_patches)
- push_patches(crt_series, patches)
- if not options.nopush:
- push_patches(crt_series, after_patches)
+ insert_idx = 0
+ applied = applied[:insert_idx] + patches + applied[insert_idx:]
+
+ unapplied = [p for p in stack.patchorder.unapplied if p not in patches]
+ hidden = list(stack.patchorder.hidden)
+
+ iw = stack.repository.default_iw
+ clean_iw = not options.keep and iw or None
+ trans = transaction.StackTransaction(stack, 'sink',
+ check_clean_iw = clean_iw)
+
+ try:
+ trans.reorder_patches(applied, unapplied, hidden, iw)
+ except transaction.TransactionHalted:
+ pass
+ return trans.run(iw)
diff --git a/t/t1501-sink.sh b/t/t1501-sink.sh
index 516aa44..a0769dd 100755
--- a/t/t1501-sink.sh
+++ b/t/t1501-sink.sh
@@ -58,7 +58,7 @@ test_expect_success 'sink specified patch below a target' '
'
test_expect_success 'sink with conflict' '
- conflict_old stg sink --to=p2 p22 &&
+ conflict stg sink --to=p2 p22 &&
test "$(echo $(stg series --applied --noprefix))" = "p1 p22" &&
test "$(echo $(stg status -c))" = "f2"
'
--
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
