Mercurial > hg

changeset 11202:f974fe896921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: hide unbundle messages by default Unbundling is an internal implementation detail for strip, only show them with --verbose.
author Matt Mackall <mpm@selenic.com>
date Thu, 20 May 2010 13:27:28 -0500
parents 34023f2ca305
children 7a9cf012dddc
files mercurial/repair.py tests/test-bookmarks-rebase.out tests/test-bookmarks-strip.out tests/test-mq-qrefresh.out tests/test-mq-strip.out tests/test-mq.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 tests/test-strip-cross.out
diffstat 18 files changed, 6 insertions(+), 221 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/repair.py	Thu May 20 12:21:35 2010 -0500
+++ b/mercurial/repair.py	Thu May 20 13:27:28 2010 -0500
@@ -136,10 +136,15 @@
             raise
 
         if saveheads or extranodes:
-            ui.status(_("adding branch\n"))
+            ui.note(_("adding branch\n"))
             f = open(chgrpfile, "rb")
             gen = changegroup.readbundle(f, chgrpfile)
+            if not repo.ui.verbose:
+                # silence internal shuffling chatter
+                repo.ui.pushbuffer()
             repo.addchangegroup(gen, 'strip', 'bundle:' + chgrpfile, True)
+            if not repo.ui.verbose:
+                repo.ui.popbuffer()
             f.close()
             if backup != "strip":
                 os.unlink(chgrpfile)
--- a/tests/test-bookmarks-rebase.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-bookmarks-rebase.out	Thu May 20 13:27:28 2010 -0500
@@ -10,11 +10,6 @@
    one                       1:925d80f479bb
 % rebase
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files (-1 heads)
 rebase completed
 changeset:   3:9163974d1cb5
 tag:         one
--- a/tests/test-bookmarks-strip.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-bookmarks-strip.out	Thu May 20 13:27:28 2010 -0500
@@ -13,11 +13,6 @@
    test2                     1:16b24da7e457
 % strip to revision 1
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 % list bookmarks
  * test                      1:9f1b7e78eff8
  * test2                     1:9f1b7e78eff8
--- a/tests/test-mq-qrefresh.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-mq-qrefresh.out	Thu May 20 13:27:28 2010 -0500
@@ -271,11 +271,6 @@
 +a
 % issue2025: qrefresh does not honor filtering options when tip != qtip
 % refresh with tip != qtip
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 % status after refresh
 M a
 % b after refresh
--- a/tests/test-mq-strip.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-mq-strip.out	Thu May 20 13:27:28 2010 -0500
@@ -85,11 +85,6 @@
 summary:     e
 
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
 % after update 4, strip 2
 changeset:   3:443431ffac4f
 tag:         tip
--- a/tests/test-mq.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-mq.out	Thu May 20 13:27:28 2010 -0500
@@ -427,11 +427,6 @@
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
@@ -457,11 +452,6 @@
 % test file move chains in the slow path
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 diff --git a/foo b/bleh
 rename from foo
 rename to bleh
@@ -530,11 +520,6 @@
 
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 changeset:   1:20cbbe65cff7
 tag:         tip
 user:        test
--- a/tests/test-rebase-cache.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-cache.out	Thu May 20 13:27:28 2010 -0500
@@ -33,11 +33,6 @@
 
 % Rebase part of branch2 (5-6) onto branch3 (8)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 
 % Branches
@@ -91,11 +86,6 @@
 o  0:1994f17a630e A branch:
 
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 rebase completed
 
 % Branches
@@ -150,11 +140,6 @@
 o  0:1994f17a630e A branch:
 
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 rebase completed
 
 % Branches
--- a/tests/test-rebase-check-restore.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-check-restore.out	Thu May 20 13:27:28 2010 -0500
@@ -56,11 +56,6 @@
 
 % - Solve the conflict and go on
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files
 rebase completed
 @  5:F:notdefault
 |
--- a/tests/test-rebase-collapse.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-collapse.out	Thu May 20 13:27:28 2010 -0500
@@ -17,11 +17,6 @@
 % 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
-adding file changes
-added 5 changesets with 6 changes to 6 files (+1 heads)
 rebase completed
 @  5: Collapsed revision
 |  * B
@@ -47,11 +42,6 @@
 
 % Rebasing G onto H
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  6: Collapsed revision
 |  * E
@@ -96,11 +86,6 @@
 
 % Rebase and collapse - E onto H
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 3 changes to 3 files
 rebase completed
 @    5: Collapsed revision
 |\   * E
@@ -146,11 +131,6 @@
 % Rebase and collapse - E onto I
 merging E
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 3 changes to 3 files
 rebase completed
 @    5: Collapsed revision
 |\   * E
@@ -192,11 +172,6 @@
 
 % Rebase and collapse - B onto F
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 4 changes to 4 files
 rebase completed
 @  2: Collapsed revision
 |  * B
--- a/tests/test-rebase-conflicts.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-conflicts.out	Thu May 20 13:27:28 2010 -0500
@@ -27,11 +27,6 @@
 
 % Conclude rebase
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files
 rebase completed
 @  5: L3
 |
--- a/tests/test-rebase-detach.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-detach.out	Thu May 20 13:27:28 2010 -0500
@@ -10,11 +10,6 @@
 
 % Rebasing D onto E detaching from C
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files (+1 heads)
 rebase completed
 @  4: D
 |
@@ -43,11 +38,6 @@
 
 % Rebasing C onto E detaching from B
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  4: D
 |
@@ -77,11 +67,6 @@
 
 % Rebasing B onto E using detach (same as not using it)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 4 changes to 4 files
 rebase completed
 @  4: D
 |
@@ -112,11 +97,6 @@
 
 % Rebasing C onto E detaching from B and collapsing
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  3: Collapsed revision
 |  * C
--- a/tests/test-rebase-issue-noparam-single-rev.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-issue-noparam-single-rev.out	Thu May 20 13:27:28 2010 -0500
@@ -14,11 +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 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files
 rebase completed
 @  4:l1
 |
@@ -46,11 +41,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 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files
 rebase completed
 @  4:l2
 |
--- a/tests/test-rebase-mq-skip.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-mq-skip.out	Thu May 20 13:27:28 2010 -0500
@@ -7,11 +7,6 @@
 % Rebase
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files
 rebase completed
 @  3 P0 tags: p0.patch qbase qtip tip
 |
--- a/tests/test-rebase-mq.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-mq.out	Thu May 20 13:27:28 2010 -0500
@@ -28,11 +28,6 @@
 
 % Fix the 2nd conflict
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 1 files
 rebase completed
 @  3 P1 tags: f2.patch qtip tip
 |
--- a/tests/test-rebase-parameters.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-parameters.out	Thu May 20 13:27:28 2010 -0500
@@ -268,11 +268,6 @@
 % 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
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 % Try to rollback after a rebase (fail)
 no rollback information available
@@ -280,65 +275,30 @@
 % 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
-adding file changes
-added 5 changesets with 5 changes to 5 files
 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
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 
 % Specify only source (from 4 onto 7)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 4 changes to 4 files (-1 heads)
 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
-adding file changes
-added 5 changesets with 5 changes to 5 files (+1 heads)
 rebase completed
 
 % Specify only base (from 3 onto 7)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files
 rebase completed
 
 % Specify source and dest (from 4 onto 6)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 4 changes to 4 files
 rebase completed
 
 % Specify base and dest (from 3 onto 6)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 5 changes to 5 files (+1 heads)
 rebase completed
--- a/tests/test-rebase-pull.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-pull.out	Thu May 20 13:27:28 2010 -0500
@@ -11,11 +11,6 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files
 rebase completed
 @  3:L1
 |
--- a/tests/test-rebase-scenario-global.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-rebase-scenario-global.out	Thu May 20 13:27:28 2010 -0500
@@ -13,11 +13,6 @@
 % Rebasing
 % B onto F - simple rebase
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 4 changes to 4 files (+1 heads)
 rebase completed
 @  5: B
 |
@@ -33,11 +28,6 @@
 
 % B onto D - intermediate point
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 5 changesets with 4 changes to 4 files (+2 heads)
 rebase completed
 @  5: B
 |
@@ -53,11 +43,6 @@
 
 % C onto F - skip of E
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 3 changes to 3 files (+1 heads)
 rebase completed
 @  4: C
 |
@@ -71,11 +56,6 @@
 
 % D onto C - rebase of a branching point (skip E)
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 2 changes to 2 files
 rebase completed
 @  4: F
 |
@@ -89,11 +69,6 @@
 
 % E onto F - merged revision having a parent in ancestors of target
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 1 changes to 1 files (-1 heads)
 rebase completed
 @    5: E
 |\
@@ -109,11 +84,6 @@
 
 % D onto B - E maintains C as parent
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 2 changes to 2 files
 rebase completed
 @  5: F
 |
--- a/tests/test-strip-cross.out	Thu May 20 12:21:35 2010 -0500
+++ b/tests/test-strip-cross.out	Thu May 20 13:27:28 2010 -0500
@@ -49,11 +49,6 @@
 
 % Trying to strip revision 0
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 4 changesets with 15 changes to 7 files (+3 heads)
 % Verifying
 checking changesets
 checking manifests
@@ -63,11 +58,6 @@
 
 % Trying to strip revision 1
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 3 changesets with 12 changes to 7 files (+3 heads)
 % Verifying
 checking changesets
 checking manifests
@@ -77,11 +67,6 @@
 
 % Trying to strip revision 2
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 2 changesets with 8 changes to 6 files (+2 heads)
 % Verifying
 checking changesets
 checking manifests
@@ -91,11 +76,6 @@
 
 % Trying to strip revision 3
 saved backup bundle to 
-adding branch
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 2 files (+1 heads)
 % Verifying
 checking changesets
 checking manifests