← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_pull.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_pull.py
1
 
# Copyright (C) 2004, 2005 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
92
92
        
93
93
        The call is logged, as is some state of the two branches.
94
94
        """
95
 
        if result.local:
96
 
            local_locked = result.local.is_locked()
97
 
            local_base = result.local.base
 
95
        if result.local_branch:
 
96
            local_locked = result.local_branch.is_locked()
 
97
            local_base = result.local_branch.base
98
98
        else:
99
99
            local_locked = None
100
100
            local_base = None
101
101
        self.hook_calls.append(
102
 
            ('post_pull', result.source, local_base, result.master.base, result.old_revno,
 
102
            ('post_pull', result.source_branch, local_base,
 
103
             result.master_branch.base, result.old_revno,
103
104
             result.old_revid,
104
 
             result.new_revno, result.new_revid, result.source.is_locked(), local_locked,
105
 
             result.master.is_locked()))
 
105
             result.new_revno, result.new_revid,
 
106
             result.source_branch.is_locked(), local_locked,
 
107
             result.master_branch.is_locked()))
106
108
 
107
109
    def test_post_pull_empty_history(self):
108
110
        target = self.make_branch('target')