← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Robert Collins
  • Date: 2005-11-05 23:01:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051105230107-63b2bb28dd1f6199
Move pending_merges() to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
149
149
    def test_pending_merges(self):
150
150
        """Tracking pending-merged revisions."""
151
151
        b = Branch.initialize('.')
152
 
 
153
 
        self.assertEquals(b.pending_merges(), [])
154
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
155
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
156
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
157
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
152
        wt = b.working_tree()
 
153
        self.assertEquals(wt.pending_merges(), [])
 
154
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
155
        self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
156
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
157
        self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc'])
158
158
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
159
 
        self.assertEquals(b.pending_merges(),
 
159
        self.assertEquals(wt.pending_merges(),
160
160
                          ['foo@azkhazan-123123-abcabc',
161
161
                           'wibble@fofof--20050401--1928390812'])
162
162
        b.commit("commit from base with two merges")
167
167
        self.assertEquals(rev.parent_ids[1],
168
168
                           'wibble@fofof--20050401--1928390812')
169
169
        # list should be cleared when we do a commit
170
 
        self.assertEquals(b.pending_merges(), [])
 
170
        self.assertEquals(wt.pending_merges(), [])
171
171
 
172
172
    def test_sign_existing_revision(self):
173
173
        branch = Branch.initialize('.')