/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_knit.py

Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_knit.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for Knit data structure"""
18
18
 
368
368
        """
369
369
        tree = self.make_branch_and_memory_tree('tree')
370
370
        tree.lock_write()
371
 
        try:
372
 
            tree.add([''], ['root-id'])
373
 
            tree.commit('one', rev_id='rev-1')
374
 
            tree.commit('two', rev_id='rev-2')
375
 
            tree.commit('three', rev_id='rev-3')
376
 
            # Pack these two revisions into another pack file, but don't remove
377
 
            # the originials
378
 
            repo = tree.branch.repository
379
 
            collection = repo._pack_collection
380
 
            collection.ensure_loaded()
381
 
            orig_packs = collection.packs
382
 
            packer = pack_repo.Packer(collection, orig_packs, '.testpack')
383
 
            new_pack = packer.pack()
384
 
 
385
 
            vf = tree.branch.repository.revisions
386
 
        finally:
387
 
            tree.unlock()
388
 
        tree.branch.repository.lock_read()
389
371
        self.addCleanup(tree.branch.repository.unlock)
 
372
        tree.add([''], ['root-id'])
 
373
        tree.commit('one', rev_id='rev-1')
 
374
        tree.commit('two', rev_id='rev-2')
 
375
        tree.commit('three', rev_id='rev-3')
 
376
        # Pack these three revisions into another pack file, but don't remove
 
377
        # the originals
 
378
        repo = tree.branch.repository
 
379
        collection = repo._pack_collection
 
380
        collection.ensure_loaded()
 
381
        orig_packs = collection.packs
 
382
        packer = pack_repo.Packer(collection, orig_packs, '.testpack')
 
383
        new_pack = packer.pack()
 
384
        # forget about the new pack
 
385
        collection.reset()
 
386
        repo.refresh_data()
 
387
        vf = tree.branch.repository.revisions
390
388
        del tree
391
389
        # Set up a reload() function that switches to using the new pack file
392
390
        new_index = new_pack.revision_index