← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_push.py

  • Committer: Martin Pool
  • Date: 2007-03-01 06:47:29 UTC
  • mfrom: (2297.1.6 resultobj)
  • mto: This revision was merged to the branch mainline in revision 2309.
  • Revision ID: mbp@sourcefrog.net-20070301064729-1y0zb2ap6ntxm9d4
merge up tags and resultobject

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_push.py
153
153
        
154
154
        The call is logged, as is some state of the two branches.
155
155
        """
156
 
        if result.local:
157
 
            local_locked = result.local.is_locked()
158
 
            local_base = result.local.base
 
156
        if result.local_branch:
 
157
            local_locked = result.local_branch.is_locked()
 
158
            local_base = result.local_branch.base
159
159
        else:
160
160
            local_locked = None
161
161
            local_base = None
162
162
        self.hook_calls.append(
163
 
            ('post_push', result.source, local_base, result.master.base,
 
163
            ('post_push', result.source_branch, local_base,
 
164
             result.master_branch.base,
164
165
             result.old_revno, result.old_revid,
165
 
             result.new_revno, result.new_revid, result.source.is_locked(), local_locked,
166
 
             result.master.is_locked()))
 
166
             result.new_revno, result.new_revid,
 
167
             result.source_branch.is_locked(), local_locked,
 
168
             result.master_branch.is_locked()))
167
169
 
168
170
    def test_post_push_empty_history(self):
169
171
        target = self.make_branch('target')