Mercurial > hg
changeset 11201:34023f2ca305
Fix up rebase's handling of strip backups
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 20 May 2010 12:21:35 -0500 |
| parents | 12e5149cafca |
| children | f974fe896921 |
| files | hgext/rebase.py tests/test-bookmarks-rebase.out tests/test-rebase-abort.out tests/test-rebase-cache.out tests/test-rebase-check-restore.out tests/test-rebase-collapse.out tests/test-rebase-conflicts.out tests/test-rebase-detach.out tests/test-rebase-issue-noparam-single-rev.out tests/test-rebase-mq-skip.out tests/test-rebase-mq.out tests/test-rebase-parameters.out tests/test-rebase-pull.out tests/test-rebase-scenario-global.out |
| diffstat | 14 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu May 20 12:15:44 2010 -0500 +++ b/hgext/rebase.py Thu May 20 12:21:35 2010 -0500 @@ -208,7 +208,8 @@ 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 @@ 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'))
--- a/tests/test-bookmarks-rebase.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-bookmarks-rebase.out Thu May 20 12:21:35 2010 -0500 @@ -9,6 +9,7 @@ * two 3:2ae46b1d99a7 one 1:925d80f479bb % rebase +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-abort.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-abort.out Thu May 20 12:21:35 2010 -0500 @@ -18,6 +18,7 @@ merging common % Abort +saved backup bundle to rebase aborted @ 4: L2 |
--- a/tests/test-rebase-cache.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-cache.out Thu May 20 12:21:35 2010 -0500 @@ -32,6 +32,7 @@ 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 0:1994f17a630e A branch: +saved backup bundle to adding branch adding changesets adding manifests @@ -147,6 +149,7 @@ |/ o 0:1994f17a630e A branch: +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-check-restore.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-check-restore.out Thu May 20 12:21:35 2010 -0500 @@ -55,6 +55,7 @@ merging A % - Solve the conflict and go on +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-collapse.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-collapse.out Thu May 20 12:21:35 2010 -0500 @@ -16,6 +16,7 @@ % 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 @@ H % Rebasing G onto H +saved backup bundle to adding branch adding changesets adding manifests @@ -93,6 +95,7 @@ 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 @@ % Rebase and collapse - E onto I merging E +saved backup bundle to adding branch adding changesets adding manifests @@ -187,6 +191,7 @@ % Rebase and collapse - B onto F +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-conflicts.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-conflicts.out Thu May 20 12:21:35 2010 -0500 @@ -26,6 +26,7 @@ abort: unresolved merge conflicts (see hg resolve) % Conclude rebase +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-detach.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-detach.out Thu May 20 12:21:35 2010 -0500 @@ -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 @@ o 0: A % Rebasing C onto E detaching from B +saved backup bundle to adding branch adding changesets adding manifests @@ -74,6 +76,7 @@ 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 @@ o 0: A % Rebasing C onto E detaching from B and collapsing +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-issue-noparam-single-rev.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-issue-noparam-single-rev.out Thu May 20 12:21:35 2010 -0500 @@ -13,6 +13,7 @@ % 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 @@ % 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
--- a/tests/test-rebase-mq-skip.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-mq-skip.out Thu May 20 12:21:35 2010 -0500 @@ -6,6 +6,7 @@ % Rebase 1 files updated, 0 files merged, 1 files removed, 0 files unresolved +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-mq.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-mq.out Thu May 20 12:21:35 2010 -0500 @@ -27,6 +27,7 @@ merging f % Fix the 2nd conflict +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-parameters.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-parameters.out Thu May 20 12:21:35 2010 -0500 @@ -267,6 +267,7 @@ % 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 @@ % 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 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 @@ rebase completed % Specify only source (from 4 onto 7) +saved backup bundle to adding branch adding changesets adding manifests @@ -304,6 +308,7 @@ % 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 @@ rebase completed % Specify only base (from 3 onto 7) +saved backup bundle to adding branch adding changesets adding manifests @@ -320,6 +326,7 @@ rebase completed % Specify source and dest (from 4 onto 6) +saved backup bundle to adding branch adding changesets adding manifests @@ -328,6 +335,7 @@ rebase completed % Specify base and dest (from 3 onto 6) +saved backup bundle to adding branch adding changesets adding manifests
--- a/tests/test-rebase-pull.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-pull.out Thu May 20 12:21:35 2010 -0500 @@ -10,6 +10,7 @@ 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
--- a/tests/test-rebase-scenario-global.out Thu May 20 12:15:44 2010 -0500 +++ b/tests/test-rebase-scenario-global.out Thu May 20 12:21:35 2010 -0500 @@ -12,6 +12,7 @@ % Rebasing % B onto F - simple rebase +saved backup bundle to adding branch adding changesets adding manifests @@ -31,6 +32,7 @@ o 0: A % B onto D - intermediate point +saved backup bundle to adding branch adding changesets adding manifests @@ -50,6 +52,7 @@ o 0: A % C onto F - skip of E +saved backup bundle to adding branch adding changesets adding manifests @@ -67,6 +70,7 @@ 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 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 0: A % D onto B - E maintains C as parent +saved backup bundle to adding branch adding changesets adding manifests