Rev 3810: Show number of revisions being bundled. (abentley) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3810
revision-id: pqm at pqm.ubuntu.com-20081030101459-f6su1v261s1rwtah
parent: pqm at pqm.ubuntu.com-20081030035600-ot66vjf0ctaw4guu
parent: aaron at aaronbentley.com-20081030094151-hyqkxchnsv2ejtqq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-10-30 10:14:59 +0000
message:
  Show number of revisions being bundled. (abentley)
modified:
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 3794.4.3
    revision-id: aaron at aaronbentley.com-20081030094151-hyqkxchnsv2ejtqq
    parent: aaron at aaronbentley.com-20081029140408-ma447s3zbydtwj7o
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: send-info
    timestamp: Thu 2008-10-30 09:41:51 +0000
    message:
      Switch to blackbox testing.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
    ------------------------------------------------------------
    revno: 3794.4.2
    revision-id: aaron at aaronbentley.com-20081029140408-ma447s3zbydtwj7o
    parent: aaron at aaronbentley.com-20081028093127-nz4zibum49eg4uvs
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: send-info
    timestamp: Wed 2008-10-29 14:04:08 +0000
    message:
      Capture notes as strings.
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
    ------------------------------------------------------------
    revno: 3794.4.1
    revision-id: aaron at aaronbentley.com-20081028093127-nz4zibum49eg4uvs
    parent: pqm at pqm.ubuntu.com-20081024113829-9geq0uavium22ho6
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: send-info
    timestamp: Tue 2008-10-28 09:31:27 +0000
    message:
      Note the number of revisions being bundled (abentley)
    modified:
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
=== modified file 'bzrlib/bundle/serializer/v4.py'
--- a/bzrlib/bundle/serializer/v4.py	2008-07-01 03:38:35 +0000
+++ b/bzrlib/bundle/serializer/v4.py	2008-10-28 09:31:27 +0000
@@ -282,6 +282,7 @@
 
     def do_write(self):
         """Write all data to the bundle"""
+        trace.note('Bundling %d revision(s).', len(self.revision_ids))
         self.repository.lock_read()
         try:
             self.bundle.begin()

=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py	2008-08-02 17:10:50 +0000
+++ b/bzrlib/tests/blackbox/test_send.py	2008-10-30 09:41:51 +0000
@@ -190,6 +190,11 @@
         stdout = self.run_bzr('send -f branch --output -')[0]
         self.assertContainsRe(stdout, 'revision3')
 
+    def test_note_revisions(self):
+        self.make_trees()
+        stderr = self.run_bzr('send -f branch --output file1')[1]
+        self.assertContainsRe(stderr, r'Bundling 1 revision\(s\).\n')
+
     def test_mailto_option(self):
         self.make_trees()
         branch = _mod_branch.Branch.open('branch')