← Back to branch summary

~maria-captains/bzr-gtk/serg

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: Sergei Golubchik
  • Date: 2014-05-05 15:43:36 UTC
  • Revision ID: sergii@pisem.net-20140505154336-outmnwfaf92a4xd6
cherry-pick http://bazaar.launchpad.net/~bzr-gtk/bzr-gtk/gtk3/revision/762

Avoid call to Repository.get_ancestry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
46
46
        tree = self.make_branch_and_tree('.')
47
47
        tree.commit('one')
48
48
 
 
49
        self.addCleanup(tree.lock_read().unlock)
49
50
        self.assertIs(None, commit.pending_revisions(tree))
50
51
 
51
52
    def test_pending_revisions_simple(self):
56
57
        tree.merge_from_branch(tree2.branch)
57
58
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
58
59
 
 
60
        self.addCleanup(tree.lock_read().unlock)
59
61
        pending_revisions = commit.pending_revisions(tree)
60
62
        # One primary merge
61
63
        self.assertEqual(1, len(pending_revisions))
74
76
        tree.merge_from_branch(tree2.branch)
75
77
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
76
78
 
 
79
        self.addCleanup(tree.lock_read().unlock)
77
80
        pending_revisions = commit.pending_revisions(tree)
78
81
        # One primary merge
79
82
        self.assertEqual(1, len(pending_revisions))
97
100
        tree.merge_from_branch(tree3.branch, force=True)
98
101
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
99
102
 
 
103
        self.addCleanup(tree.lock_read().unlock)
100
104
        pending_revisions = commit.pending_revisions(tree)
101
105
        # Two primary merges
102
106
        self.assertEqual(2, len(pending_revisions))