~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_missing.py

  • Committer: Aaron Bentley
  • Date: 2005-09-19 07:06:16 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20050919070616-1895f4b1d9dd0caa
switched fetch_missing to use 'parent', not 'x-pull'

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
    """Install the revisions of missing ancestors from another branch."""
21
21
    this_branch = Branch.open_containing('.')
22
22
    if branch is None:
23
 
        try:
24
 
            branch = this_branch.controlfile("x-pull", "rb").read().rstrip('\n')
25
 
            print "Using last location: %s" % branch
26
 
        except IOError, e:
27
 
            if e.errno != errno.ENOENT:
28
 
                raise
29
 
            else:
30
 
                raise BzrCommandError("No pull location known or specified.")
 
23
        branch = this_branch.get_parent()
31
24
 
32
25
    other_branch = Branch.open_containing(branch)
33
26
    installed = []