← 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-07 12:51:20 UTC
  • Revision ID: robertc@robertcollins.net-20050907125120-8661be3d7d7f4b25
make bzr selftest run the plugins tests, and fix them

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