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

  • Committer: Aaron Bentley
  • Date: 2007-06-09 05:19:15 UTC
  • mto: This revision was merged to the branch mainline in revision 2534.
  • Revision ID: aaron.bentley@utoronto.ca-20070609051915-6bd1t4zmvw04f3wx
Adapt find_borders to produce a graph difference

Show diffs side-by-side

added added

removed removed

Lines of Context:
156
156
        graph = mainline_tree.branch.repository.get_graph(
157
157
            feature_tree.branch.repository)
158
158
        self.assertEqual('rev2b', graph.find_unique_lca('rev2a', 'rev3b'))
 
159
 
 
160
    def test_graph_difference(self):
 
161
        graph = self.make_graph(ancestry_1)
 
162
        self.assertEqual((set(), set()), graph.find_difference('rev1', 'rev1'))
 
163
        self.assertEqual((set(), set(['rev1'])),
 
164
                         graph.find_difference(NULL_REVISION, 'rev1'))
 
165
        self.assertEqual((set(['rev1']), set()),
 
166
                         graph.find_difference('rev1', NULL_REVISION))
 
167
        self.assertEqual((set(['rev2a', 'rev3']), set(['rev2b'])),
 
168
                         graph.find_difference('rev3', 'rev2b'))
 
169
        self.assertEqual((set(['rev4', 'rev3', 'rev2a']), set()),
 
170
                         graph.find_difference('rev4', 'rev2b'))
 
171
 
 
172
    def test_graph_difference_criss_cross(self):
 
173
        graph = self.make_graph(criss_cross)
 
174
        self.assertEqual((set(['rev3a']), set(['rev3b'])),
 
175
                         graph.find_difference('rev3a', 'rev3b'))
 
176
        self.assertEqual((set([]), set(['rev3b', 'rev2b'])),
 
177
                         graph.find_difference('rev2a', 'rev3b'))