← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_missing.py

  • Committer: Robert Collins
  • Date: 2005-09-28 05:43:19 UTC
  • mto: (147.2.6) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20050928054319-2c2e9e3048bbc215
find_branch -> open_containing change

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_missing.py
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
from bzrlib.branch import find_branch
 
16
from bzrlib.branch import Branch
17
17
from bzrlib.fetch import greedy_fetch
18
18
from bzrlib.errors import NoSuchRevision, InstallFailed
19
19
def fetch_missing(branch):
20
20
    """Install the revisions of missing ancestors from another branch."""
21
 
    this_branch = find_branch('.')
 
21
    this_branch = Branch.open_containing('.')
22
22
    if branch is None:
23
23
        try:
24
24
            branch = this_branch.controlfile("x-pull", "rb").read().rstrip('\n')
29
29
            else:
30
30
                raise BzrCommandError("No pull location known or specified.")
31
31
 
32
 
    other_branch = find_branch(branch)
 
32
    other_branch = Branch.open_containing(branch)
33
33
    installed = []
34
34
    failed = []
35
35