# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-05-20 17:21:35
# Node ID 34023f2ca305d3e988b4d8b1bcd88bd42a00f772
# Parent  12e5149cafca6ea2f604d79ef2f5cb3f93707d57

Fix up rebase's handling of strip backups

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -208,7 +208,8 @@ def rebase(ui, repo, **opts):
                     ui.warn(_("warning: new changesets detected "
                               "on source branch, not stripping\n"))
                 else:
-                    repair.strip(ui, repo, repo[min(rebased)].node(), "strip")
+                    # backup the old csets by default
+                    repair.strip(ui, repo, repo[min(rebased)].node(), "all")
 
         clearstatus(repo)
         ui.status(_("rebase completed\n"))
@@ -433,7 +434,8 @@ def abort(repo, originalwd, target, stat
         rebased = filter(lambda x: x > -1, state.values())
         if rebased:
             strippoint = min(rebased)
-            repair.strip(repo.ui, repo, repo[strippoint].node(), "strip")
+            # no backup of rebased cset versions needed
+            repair.strip(repo.ui, repo, repo[strippoint].node())
         clearstatus(repo)
         repo.ui.status(_('rebase aborted\n'))
 
diff --git a/tests/test-bookmarks-rebase.out b/tests/test-bookmarks-rebase.out
--- a/tests/test-bookmarks-rebase.out
+++ b/tests/test-bookmarks-rebase.out
@@ -9,6 +9,7 @@ adding d
  * two                       3:2ae46b1d99a7
    one                       1:925d80f479bb
 % rebase
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-abort.out b/tests/test-rebase-abort.out
--- a/tests/test-rebase-abort.out
+++ b/tests/test-rebase-abort.out
@@ -18,6 +18,7 @@ abort: fix unresolved conflicts with hg 
 merging common
 
 % Abort
+saved backup bundle to 
 rebase aborted
 @  4: L2
 |
diff --git a/tests/test-rebase-cache.out b/tests/test-rebase-cache.out
--- a/tests/test-rebase-cache.out
+++ b/tests/test-rebase-cache.out
@@ -32,6 +32,7 @@ 2:65a26a4d12f6 B branch: branch1
 0:1994f17a630e A branch: 
 
 % Rebase part of branch2 (5-6) onto branch3 (8)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -89,6 +90,7 @@ o  7:33c9da881988 Branch3 branch: branch
 |/
 o  0:1994f17a630e A branch:
 
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -147,6 +149,7 @@ o  7:33c9da881988 Branch3 branch: branch
 |/
 o  0:1994f17a630e A branch:
 
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-check-restore.out b/tests/test-rebase-check-restore.out
--- a/tests/test-rebase-check-restore.out
+++ b/tests/test-rebase-check-restore.out
@@ -55,6 +55,7 @@ abort: fix unresolved conflicts with hg 
 merging A
 
 % - Solve the conflict and go on
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-collapse.out b/tests/test-rebase-collapse.out
--- a/tests/test-rebase-collapse.out
+++ b/tests/test-rebase-collapse.out
@@ -16,6 +16,7 @@ o  0: A
 
 % Rebasing B onto H
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -45,6 +46,7 @@ F
 H
 
 % Rebasing G onto H
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -93,6 +95,7 @@ o  0: A
 abort: unable to collapse, there is more than one external parent
 
 % Rebase and collapse - E onto H
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -142,6 +145,7 @@ o  0: A
 
 % Rebase and collapse - E onto I
 merging E
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -187,6 +191,7 @@ o  0: A
 
 
 % Rebase and collapse - B onto F
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-conflicts.out b/tests/test-rebase-conflicts.out
--- a/tests/test-rebase-conflicts.out
+++ b/tests/test-rebase-conflicts.out
@@ -26,6 +26,7 @@ abort: fix unresolved conflicts with hg 
 abort: unresolved merge conflicts (see hg resolve)
 
 % Conclude rebase
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-detach.out b/tests/test-rebase-detach.out
--- a/tests/test-rebase-detach.out
+++ b/tests/test-rebase-detach.out
@@ -9,6 +9,7 @@
 o  0: A
 
 % Rebasing D onto E detaching from C
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -41,6 +42,7 @@ E
 o  0: A
 
 % Rebasing C onto E detaching from B
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -74,6 +76,7 @@ E
 o  0: A
 
 % Rebasing B onto E using detach (same as not using it)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -108,6 +111,7 @@ E
 o  0: A
 
 % Rebasing C onto E detaching from B and collapsing
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-issue-noparam-single-rev.out b/tests/test-rebase-issue-noparam-single-rev.out
--- a/tests/test-rebase-issue-noparam-single-rev.out
+++ b/tests/test-rebase-issue-noparam-single-rev.out
@@ -13,6 +13,7 @@ o  0:c1
 
 % Rebase with no arguments - single revision in source branch
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -44,6 +45,7 @@ o  0:c1
 
 % Rebase with no arguments - single revision in target branch
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-mq-skip.out b/tests/test-rebase-mq-skip.out
--- a/tests/test-rebase-mq-skip.out
+++ b/tests/test-rebase-mq-skip.out
@@ -6,6 +6,7 @@ applying p1.patch
 
 % Rebase
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-mq.out b/tests/test-rebase-mq.out
--- a/tests/test-rebase-mq.out
+++ b/tests/test-rebase-mq.out
@@ -27,6 +27,7 @@ abort: fix unresolved conflicts with hg 
 merging f
 
 % Fix the 2nd conflict
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-parameters.out b/tests/test-rebase-parameters.out
--- a/tests/test-rebase-parameters.out
+++ b/tests/test-rebase-parameters.out
@@ -267,6 +267,7 @@ nothing to rebase
 
 % Rebase with no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -278,6 +279,7 @@ no rollback information available
 
 % Rebase with base == '.' => same as no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -287,6 +289,7 @@ rebase completed
 
 % Rebase with dest == default => same as no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -295,6 +298,7 @@ added 5 changesets with 5 changes to 5 f
 rebase completed
 
 % Specify only source (from 4 onto 7)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -304,6 +308,7 @@ rebase completed
 
 % Specify only dest (from 3 onto 6)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -312,6 +317,7 @@ added 5 changesets with 5 changes to 5 f
 rebase completed
 
 % Specify only base (from 3 onto 7)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -320,6 +326,7 @@ added 5 changesets with 5 changes to 5 f
 rebase completed
 
 % Specify source and dest (from 4 onto 6)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -328,6 +335,7 @@ added 4 changesets with 4 changes to 4 f
 rebase completed
 
 % Specify base and dest (from 3 onto 6)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-pull.out b/tests/test-rebase-pull.out
--- a/tests/test-rebase-pull.out
+++ b/tests/test-rebase-pull.out
@@ -10,6 +10,7 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
diff --git a/tests/test-rebase-scenario-global.out b/tests/test-rebase-scenario-global.out
--- a/tests/test-rebase-scenario-global.out
+++ b/tests/test-rebase-scenario-global.out
@@ -12,6 +12,7 @@ o  0: A
 
 % Rebasing
 % B onto F - simple rebase
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -31,6 +32,7 @@ o |  2: D
 o  0: A
 
 % B onto D - intermediate point
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -50,6 +52,7 @@ o |  2: D
 o  0: A
 
 % C onto F - skip of E
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -67,6 +70,7 @@ o  2: D
 o  0: A
 
 % D onto C - rebase of a branching point (skip E)
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -84,6 +88,7 @@ o  2: C
 o  0: A
 
 % E onto F - merged revision having a parent in ancestors of target
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests
@@ -103,6 +108,7 @@ o |  2: C
 o  0: A
 
 % D onto B - E maintains C as parent
+saved backup bundle to 
 adding branch
 adding changesets
 adding manifests