Fix the sink command for various test cases

[stgit] / stgit / commands / sink.py

diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index 2167d873ba422e62ca41c5813bc02112e515c6bb..7e5c955cf7489e71c4aa6c901055cd78a3c89e58 100644 (file)
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -49,7 +49,7 @@ def func(parser, options, args):
 
     oldapplied = crt_series.get_applied()
     unapplied = crt_series.get_unapplied()
-    all = unapplied + oldapplied
+    all = oldapplied + unapplied
 
     if options.to and not options.to in oldapplied:
         raise CmdException('Cannot sink below %s, since it is not applied'
@@ -58,13 +58,34 @@ def func(parser, options, args):
     if len(args) > 0:
         patches = parse_patches(args, all)
     else:
-        patches = [ crt_series.get_current() ]
-
-    crt_series.pop_patch(options.to or oldapplied[0])
+        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:
-        newapplied = crt_series.get_applied()
-        def not_reapplied_yet(p):
-            return not p in newapplied
-        push_patches(crt_series, filter(not_reapplied_yet, oldapplied))
+        push_patches(crt_series, after_patches)