← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_ghosts.py

Make work with integration again.

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