← 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: 2006-02-01 04:28:35 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060201042835-0ff0d7af60662f20
Fixed graph-ancestry

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_ghosts.py
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
16
from bzrlib.branch import Branch
 
17
from bzrlib.fetch import greedy_fetch
17
18
from bzrlib.errors import NoSuchRevision, InstallFailed, BzrCommandError
18
19
def fetch_ghosts(branch, no_fix):
19
20
    """Install ghosts from copies in another branch."""
29
30
    installed = []
30
31
    failed = []
31
32
    lock_other = this_branch.base != other_branch.base
32
 
 
 
33
    
33
34
    this_branch.lock_write()
34
35
    try:
35
36
        if lock_other:
41
42
            ghosts = iter_ghosts(this_branch)
42
43
            for revision in ghosts:
43
44
                try:
44
 
                    this_branch.fetch(other_branch, revision)
 
45
                    greedy_fetch(this_branch, other_branch, revision)
45
46
                    installed.append(revision)
46
47
                except InstallFailed:
47
48
                    failed.append(revision)
63
64
        this_branch.unlock()
64
65
 
65
66
    if not no_fix and len(installed) > 0:
66
 
        from bzrlib.builtins import cmd_reconcile
67
 
        cmd_reconcile().run(".")
68
 
 
 
67
        from reweave_inventory import cmd_fix
 
68
        cmd_fix().run(".")
 
69
        
69
70
def iter_ghosts(branch):
70
71
    """Find all ancestors that aren't stored in this branch."""
71
72
    seen = set()
79
80
                continue
80
81
            seen.add(line)
81
82
            try:
82
 
                revision = branch.repository.get_revision(line)
 
83
                revision = branch.get_revision(line)
83
84
                new_lines.extend(revision.parent_ids)
84
85
            except NoSuchRevision:
85
86
                yield line