← 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: 2008-11-12 17:09:36 UTC
  • Revision ID: aaron@aaronbentley.com-20081112170936-3dybsv7il8gxhchz
Use bzrlib's getchar

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_ghosts.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 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('.')
 
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]
22
21
    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.")
 
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
31
27
 
32
 
    other_branch = find_branch(branch)
 
28
    other_branch = Branch.open_containing(branch)[0]
33
29
    installed = []
34
30
    failed = []
 
31
    lock_other = this_branch.base != other_branch.base
35
32
 
36
 
    # Because iter_missing_ancestors tests for existence after our last fetch
37
 
    # is complete, it won't falsely report an ancestor as missing.
38
 
    # Yay iterators!
39
 
    missing = iter_missing_ancestors(this_branch)
40
 
    for revision in missing:
 
33
    this_branch.lock_write()
 
34
    try:
 
35
        if lock_other:
 
36
            other_branch.lock_read()
41
37
        try:
42
 
            greedy_fetch(this_branch, other_branch, revision)
43
 
            installed.append(revision)
44
 
        except InstallFailed:
45
 
            failed.append(revision)
46
 
    if len(installed) > 0:
47
 
        print "Installed:"
48
 
    for rev in installed:
49
 
        print rev
50
 
    if len(failed) > 0:
51
 
        print "Still missing:"
52
 
    for rev in failed:
53
 
        print rev
54
 
 
55
 
def iter_missing_ancestors(branch):
 
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):
56
70
    """Find all ancestors that aren't stored in this branch."""
57
71
    seen = set()
58
 
    lines = [branch.last_patch()]
 
72
    lines = [branch.last_revision()]
 
73
    if lines[0] is None:
 
74
        return
59
75
    while len(lines) > 0:
60
76
        new_lines = []
61
77
        for line in lines:
63
79
                continue
64
80
            seen.add(line)
65
81
            try:
66
 
                revision = branch.get_revision(line)
67
 
                new_lines.extend([r.revision_id for r in revision.parents])
 
82
                revision = branch.repository.get_revision(line)
 
83
                new_lines.extend(revision.parent_ids)
68
84
            except NoSuchRevision:
69
85
                yield line
70
86
        lines = new_lines