/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/versionedfile.py

[merge] bzr.dev 2255

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# Authors:
4
4
#   Johan Rydberg <jrydberg@gnu.org>
19
19
 
20
20
"""Versioned text file storage api."""
21
21
 
22
 
 
 
22
from bzrlib.lazy_import import lazy_import
 
23
lazy_import(globals(), """
23
24
from copy import deepcopy
24
 
from unittest import TestSuite
25
 
 
26
 
 
27
 
import bzrlib.errors as errors
 
25
import unittest
 
26
 
 
27
from bzrlib import (
 
28
    errors,
 
29
    tsort,
 
30
    revision,
 
31
    ui,
 
32
    )
 
33
from bzrlib.transport.memory import MemoryTransport
 
34
""")
 
35
 
28
36
from bzrlib.inter import InterObject
29
37
from bzrlib.textmerge import TextMerge
30
 
from bzrlib.transport.memory import MemoryTransport
31
 
from bzrlib.tsort import topo_sort
32
 
from bzrlib import ui
33
38
from bzrlib.symbol_versioning import (deprecated_function,
34
39
        deprecated_method,
35
40
        zero_eight,
54
59
        self.finished = False
55
60
        self._access_mode = access_mode
56
61
 
 
62
    @staticmethod
 
63
    def check_not_reserved_id(version_id):
 
64
        revision.check_not_reserved_id(version_id)
 
65
 
57
66
    def copy_to(self, name, transport):
58
67
        """Copy this versioned file to name on transport."""
59
68
        raise NotImplementedError(self.copy_to)
473
482
        """
474
483
        raise NotImplementedError(VersionedFile.plan_merge)
475
484
        
476
 
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER, 
 
485
    def weave_merge(self, plan, a_marker=TextMerge.A_MARKER,
477
486
                    b_marker=TextMerge.B_MARKER):
478
487
        return PlanWeaveMerge(plan, a_marker, b_marker).merge_lines()[0]
479
488
 
590
599
            target = temp_source
591
600
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
592
601
        graph = self.source.get_graph(version_ids)
593
 
        order = topo_sort(graph.items())
 
602
        order = tsort.topo_sort(graph.items())
594
603
        pb = ui.ui_factory.nested_progress_bar()
595
604
        parent_texts = {}
596
605
        try:
677
686
        self._formats = formats
678
687
    
679
688
    def adapt(self, test):
680
 
        result = TestSuite()
 
689
        result = unittest.TestSuite()
681
690
        for (interversionedfile_class,
682
691
             versionedfile_factory,
683
692
             versionedfile_factory_to) in self._formats: