← 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-10-27 04:45:06 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20051027044506-45f616c07537a1da
Got the shell basics working properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_ghosts.py
16
16
from bzrlib.branch import Branch
17
17
from bzrlib.fetch import greedy_fetch
18
18
from bzrlib.errors import NoSuchRevision, InstallFailed, BzrCommandError
19
 
def fetch_ghosts(branch, no_fix):
 
19
def fetch_ghosts(branch):
20
20
    """Install ghosts from copies in another branch."""
21
21
    this_branch = Branch.open_containing('.')[0]
22
22
    if branch is None:
29
29
    other_branch = Branch.open_containing(branch)[0]
30
30
    installed = []
31
31
    failed = []
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()
 
32
 
 
33
    # Because iter_ghosts tests for existence after our last fetch
 
34
    # is complete, it won't falsely report an ancestor as a ghost.
 
35
    # Yay iterators!
 
36
    ghosts = iter_ghosts(this_branch)
 
37
    for revision in ghosts:
38
38
        try:
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()
 
39
            greedy_fetch(this_branch, other_branch, revision)
 
40
            installed.append(revision)
 
41
        except InstallFailed:
 
42
            failed.append(revision)
 
43
    if len(installed) > 0:
 
44
        print "Installed:"
 
45
    for rev in installed:
 
46
        print rev
 
47
    if len(failed) > 0:
 
48
        print "Still missing:"
 
49
    for rev in failed:
 
50
        print rev
65
51
 
66
 
    if not no_fix and len(installed) > 0:
67
 
        from reweave_inventory import cmd_fix
68
 
        cmd_fix().run(".")
69
 
        
70
52
def iter_ghosts(branch):
71
53
    """Find all ancestors that aren't stored in this branch."""
72
54
    seen = set()
73
55
    lines = [branch.last_revision()]
74
 
    if lines[0] is None:
75
 
        return
76
56
    while len(lines) > 0:
77
57
        new_lines = []
78
58
        for line in lines: