← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_ghosts.py

  • Committer: Aaron Bentley
  • Date: 2005-12-03 20:42:25 UTC
  • mfrom: (147.4.25 trunk)
  • mto: (147.4.27 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: aaron.bentley@utoronto.ca-20051203204225-25678bc921de4fc1
Merge from lifeless

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_ghosts.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
from bzrlib.branch import Branch
17
17
from bzrlib.fetch import greedy_fetch
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 = Branch.open_containing('.')
 
18
from bzrlib.errors import NoSuchRevision, InstallFailed, BzrCommandError
 
19
def fetch_ghosts(branch, no_fix):
 
20
    """Install ghosts from copies in another branch."""
 
21
    this_branch = Branch.open_containing('.')[0]
22
22
    if branch is None:
23
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
24
28
 
25
 
    other_branch = Branch.open_containing(branch)
 
29
    other_branch = Branch.open_containing(branch)[0]
26
30
    installed = []
27
31
    failed = []
28
 
 
29
 
    # Because iter_missing_ancestors tests for existence after our last fetch
30
 
    # is complete, it won't falsely report an ancestor as missing.
31
 
    # Yay iterators!
32
 
    missing = iter_missing_ancestors(this_branch)
33
 
    for revision in missing:
 
32
    lock_other = this_branch.base != other_branch.base
 
33
    
 
34
    this_branch.lock_write()
 
35
    try:
 
36
        if lock_other:
 
37
            other_branch.lock_read()
34
38
        try:
35
 
            greedy_fetch(this_branch, other_branch, revision)
36
 
            installed.append(revision)
37
 
        except InstallFailed:
38
 
            failed.append(revision)
39
 
    if len(installed) > 0:
40
 
        print "Installed:"
41
 
    for rev in installed:
42
 
        print rev
43
 
    if len(failed) > 0:
44
 
        print "Still missing:"
45
 
    for rev in failed:
46
 
        print rev
 
39
            # Because iter_ghosts tests for existence after our last fetch
 
40
            # is complete, it won't falsely report an ancestor as a ghost.
 
41
            # Yay iterators!
 
42
            ghosts = iter_ghosts(this_branch)
 
43
            for revision in ghosts:
 
44
                try:
 
45
                    greedy_fetch(this_branch, other_branch, revision)
 
46
                    installed.append(revision)
 
47
                except InstallFailed:
 
48
                    failed.append(revision)
 
49
            else:
 
50
                if this_branch.last_revision() is None:
 
51
                    print "No revisions in branch."
 
52
            if len(installed) > 0:
 
53
                print "Installed:"
 
54
                for rev in installed:
 
55
                    print rev
 
56
            if len(failed) > 0:
 
57
                print "Still missing:"
 
58
                for rev in failed:
 
59
                    print rev
 
60
        finally:
 
61
            if lock_other:
 
62
                other_branch.unlock()
 
63
    finally:
 
64
        this_branch.unlock()
47
65
 
48
 
def iter_missing_ancestors(branch):
 
66
    if not no_fix and len(installed) > 0:
 
67
        from reweave_inventory import cmd_fix
 
68
        cmd_fix().run(".")
 
69
        
 
70
def iter_ghosts(branch):
49
71
    """Find all ancestors that aren't stored in this branch."""
50
72
    seen = set()
51
 
    lines = [branch.last_patch()]
 
73
    lines = [branch.last_revision()]
 
74
    if lines[0] is None:
 
75
        return
52
76
    while len(lines) > 0:
53
77
        new_lines = []
54
78
        for line in lines:
57
81
            seen.add(line)
58
82
            try:
59
83
                revision = branch.get_revision(line)
60
 
                new_lines.extend([r.revision_id for r in revision.parents])
 
84
                new_lines.extend(revision.parent_ids)
61
85
            except NoSuchRevision:
62
86
                yield line
63
87
        lines = new_lines