Mercurial > hg-stable

changeset 11203:7a9cf012dddc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: only show "rebase completed" message with -v
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 15:15:11 -0500
parents f974fe896921
children 54e93b86a9e3
files hgext/rebase.py tests/test-bookmarks-rebase.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-interruptions.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, 1 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Thu May 20 13:27:28 2010 -0500
+++ b/hgext/rebase.py	Thu May 20 15:15:11 2010 -0500
@@ -212,7 +212,7 @@
                     repair.strip(ui, repo, repo[min(rebased)].node(), "all")
 
         clearstatus(repo)
-        ui.status(_("rebase completed\n"))
+        ui.note(_("rebase completed\n"))
         if os.path.exists(repo.sjoin('undo')):
             util.unlink(repo.sjoin('undo'))
         if skipped:
--- a/tests/test-bookmarks-rebase.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-bookmarks-rebase.out	Thu May 20 15:15:11 2010 -0500
@@ -10,7 +10,6 @@
    one                       1:925d80f479bb
 % rebase
 saved backup bundle to 
-rebase completed
 changeset:   3:9163974d1cb5
 tag:         one
 tag:         tip
--- a/tests/test-rebase-cache.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-cache.out	Thu May 20 15:15:11 2010 -0500
@@ -33,7 +33,6 @@
 
 % Rebase part of branch2 (5-6) onto branch3 (8)
 saved backup bundle to 
-rebase completed
 
 % Branches
 branch3                        8:c9bfa9beb84e
@@ -86,7 +85,6 @@
 o  0:1994f17a630e A branch:
 
 saved backup bundle to 
-rebase completed
 
 % Branches
 branch2                        8:b44d3024f247
@@ -140,7 +138,6 @@
 o  0:1994f17a630e A branch:
 
 saved backup bundle to 
-rebase completed
 
 % Branches
 branch2                        7:b44d3024f247
--- a/tests/test-rebase-check-restore.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-check-restore.out	Thu May 20 15:15:11 2010 -0500
@@ -18,7 +18,6 @@
 merging A
 
 % - Solve the conflict and go on
-rebase completed
 @  7:C:
 |
 o  6:B:
@@ -56,7 +55,6 @@
 
 % - Solve the conflict and go on
 saved backup bundle to 
-rebase completed
 @  5:F:notdefault
 |
 o  4:E:
--- a/tests/test-rebase-collapse.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-collapse.out	Thu May 20 15:15:11 2010 -0500
@@ -17,7 +17,6 @@
 % Rebasing B onto H
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 saved backup bundle to 
-rebase completed
 @  5: Collapsed revision
 |  * B
 |  * C
@@ -42,7 +41,6 @@
 
 % Rebasing G onto H
 saved backup bundle to 
-rebase completed
 @  6: Collapsed revision
 |  * E
 |  * G
@@ -86,7 +84,6 @@
 
 % Rebase and collapse - E onto H
 saved backup bundle to 
-rebase completed
 @    5: Collapsed revision
 |\   * E
 | |  * F
@@ -131,7 +128,6 @@
 % Rebase and collapse - E onto I
 merging E
 saved backup bundle to 
-rebase completed
 @    5: Collapsed revision
 |\   * E
 | |  * F
@@ -172,7 +168,6 @@
 
 % Rebase and collapse - B onto F
 saved backup bundle to 
-rebase completed
 @  2: Collapsed revision
 |  * B
 |  * C
--- a/tests/test-rebase-conflicts.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-conflicts.out	Thu May 20 15:15:11 2010 -0500
@@ -27,7 +27,6 @@
 
 % Conclude rebase
 saved backup bundle to 
-rebase completed
 @  5: L3
 |
 o  4: L2
--- a/tests/test-rebase-detach.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-detach.out	Thu May 20 15:15:11 2010 -0500
@@ -10,7 +10,6 @@
 
 % Rebasing D onto E detaching from C
 saved backup bundle to 
-rebase completed
 @  4: D
 |
 o  3: E
@@ -38,7 +37,6 @@
 
 % Rebasing C onto E detaching from B
 saved backup bundle to 
-rebase completed
 @  4: D
 |
 o  3: C
@@ -67,7 +65,6 @@
 
 % Rebasing B onto E using detach (same as not using it)
 saved backup bundle to 
-rebase completed
 @  4: D
 |
 o  3: C
@@ -97,7 +94,6 @@
 
 % Rebasing C onto E detaching from B and collapsing
 saved backup bundle to 
-rebase completed
 @  3: Collapsed revision
 |  * C
 |  * D
--- a/tests/test-rebase-interruptions.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-interruptions.out	Thu May 20 15:15:11 2010 -0500
@@ -41,7 +41,6 @@
 
 % - Solve the conflict and go on
 warning: new changesets detected on source branch, not stripping
-rebase completed
 @  7: C
 |
 | o  6: Extra
--- a/tests/test-rebase-issue-noparam-single-rev.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-issue-noparam-single-rev.out	Thu May 20 15:15:11 2010 -0500
@@ -14,7 +14,6 @@
 % 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 
-rebase completed
 @  4:l1
 |
 o  3:r2
@@ -41,7 +40,6 @@
 % 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 
-rebase completed
 @  4:l2
 |
 o  3:l1
--- a/tests/test-rebase-mq-skip.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-mq-skip.out	Thu May 20 15:15:11 2010 -0500
@@ -7,7 +7,6 @@
 % Rebase
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to 
-rebase completed
 @  3 P0 tags: p0.patch qbase qtip tip
 |
 o  2 P1 tags: qparent
--- a/tests/test-rebase-mq.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-mq.out	Thu May 20 15:15:11 2010 -0500
@@ -28,7 +28,6 @@
 
 % Fix the 2nd conflict
 saved backup bundle to 
-rebase completed
 @  3 P1 tags: f2.patch qtip tip
 |
 o  2 P0 tags: f.patch qbase
--- a/tests/test-rebase-parameters.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-parameters.out	Thu May 20 15:15:11 2010 -0500
@@ -268,37 +268,29 @@
 % Rebase with no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 saved backup bundle to 
-rebase completed
 % Try to rollback after a rebase (fail)
 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 
-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 
-rebase completed
 
 % Specify only source (from 4 onto 7)
 saved backup bundle to 
-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 
-rebase completed
 
 % Specify only base (from 3 onto 7)
 saved backup bundle to 
-rebase completed
 
 % Specify source and dest (from 4 onto 6)
 saved backup bundle to 
-rebase completed
 
 % Specify base and dest (from 3 onto 6)
 saved backup bundle to 
-rebase completed
--- a/tests/test-rebase-pull.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-pull.out	Thu May 20 15:15:11 2010 -0500
@@ -11,7 +11,6 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 saved backup bundle to 
-rebase completed
 @  3:L1
 |
 o  2:R1
--- a/tests/test-rebase-scenario-global.out	Thu May 20 13:27:28 2010 -0500
+++ b/tests/test-rebase-scenario-global.out	Thu May 20 15:15:11 2010 -0500
@@ -13,7 +13,6 @@
 % Rebasing
 % B onto F - simple rebase
 saved backup bundle to 
-rebase completed
 @  5: B
 |
 o  4: F
@@ -28,7 +27,6 @@
 
 % B onto D - intermediate point
 saved backup bundle to 
-rebase completed
 @  5: B
 |
 | o  4: F
@@ -43,7 +41,6 @@
 
 % C onto F - skip of E
 saved backup bundle to 
-rebase completed
 @  4: C
 |
 o  3: F
@@ -56,7 +53,6 @@
 
 % D onto C - rebase of a branching point (skip E)
 saved backup bundle to 
-rebase completed
 @  4: F
 |
 o  3: D
@@ -69,7 +65,6 @@
 
 % E onto F - merged revision having a parent in ancestors of target
 saved backup bundle to 
-rebase completed
 @    5: E
 |\
 | o  4: F
@@ -84,7 +79,6 @@
 
 % D onto B - E maintains C as parent
 saved backup bundle to 
-rebase completed
 @  5: F
 |
 | o  4: E