← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_missing.py

  • Committer: Aaron Bentley
  • Date: 2005-09-13 22:49:40 UTC
  • mto: (147.1.21)
  • mto: This revision was merged to the branch mainline in revision 154.
  • Revision ID: abentley@panoramicfeedback.com-20050913224940-c6db07f39dd303be
Updated docs, obsoleted old executibles

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 Branch
 
16
from bzrlib.branch import find_branch
17
17
from bzrlib.fetch import greedy_fetch
18
 
from bzrlib.errors import NoSuchRevision, InstallFailed, BzrCommandError
19
 
def fetch_ghosts(branch):
20
 
    """Install ghosts from copies in another branch."""
21
 
    this_branch = Branch.open_containing('.')[0]
 
18
from bzrlib.errors import NoSuchRevision, InstallFailed
 
19
def fetch_missing(branch):
 
20
    """Install the revisions of missing ancestors from another branch."""
 
21
    this_branch = find_branch('.')
22
22
    if branch is None:
23
 
        branch = this_branch.get_parent()
24
 
        if branch is None:
25
 
            raise BzrCommandError('No branch specified and no location saved.')
26
 
        else:
27
 
            print "Using saved location %s" % branch
 
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.")
28
31
 
29
 
    other_branch = Branch.open_containing(branch)[0]
 
32
    other_branch = find_branch(branch)
30
33
    installed = []
31
34
    failed = []
32
35
 
33
 
    # Because iter_ghosts tests for existence after our last fetch
34
 
    # is complete, it won't falsely report an ancestor as a ghost.
 
36
    # Because iter_missing_ancestors tests for existence after our last fetch
 
37
    # is complete, it won't falsely report an ancestor as missing.
35
38
    # Yay iterators!
36
 
    ghosts = iter_ghosts(this_branch)
37
 
    for revision in ghosts:
 
39
    missing = iter_missing_ancestors(this_branch)
 
40
    for revision in missing:
38
41
        try:
39
42
            greedy_fetch(this_branch, other_branch, revision)
40
43
            installed.append(revision)
49
52
    for rev in failed:
50
53
        print rev
51
54
 
52
 
def iter_ghosts(branch):
 
55
def iter_missing_ancestors(branch):
53
56
    """Find all ancestors that aren't stored in this branch."""
54
57
    seen = set()
55
 
    lines = [branch.last_revision()]
 
58
    lines = [branch.last_patch()]
56
59
    while len(lines) > 0:
57
60
        new_lines = []
58
61
        for line in lines:
61
64
            seen.add(line)
62
65
            try:
63
66
                revision = branch.get_revision(line)
64
 
                new_lines.extend(revision.parent_ids)
 
67
                new_lines.extend([r.revision_id for r in revision.parents])
65
68
            except NoSuchRevision:
66
69
                yield line
67
70
        lines = new_lines