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