← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_missing.py

  • Committer: Aaron Bentley
  • Date: 2005-09-13 22:49:40 UTC
  • mto: (147.1.21)
  • mto: This revision was merged to the branch mainline in revision 154.
  • Revision ID: abentley@panoramicfeedback.com-20050913224940-c6db07f39dd303be
Updated docs, obsoleted old executibles

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.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.')
 
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
    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
30
29
            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()
 
30
                raise BzrCommandError("No pull location known or specified.")
 
31
 
 
32
    other_branch = find_branch(branch)
 
33
    installed = []
 
34
    failed = []
 
35
 
 
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:
42
41
        try:
43
 
            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)
86
 
            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()
 
42
            greedy_fetch(this_branch, other_branch, revision)
 
43
            installed.append(revision)
 
44
        except InstallFailed:
 
45
            failed.append(revision)
93
46
    if len(installed) > 0:
94
47
        print "Installed:"
95
 
        for rev in installed:
96
 
            print rev
 
48
    for rev in installed:
 
49
        print rev
97
50
    if len(failed) > 0:
98
51
        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
 
 
 
52
    for rev in failed:
 
53
        print rev
 
54
 
 
55
def iter_missing_ancestors(branch):
 
56
    """Find all ancestors that aren't stored in this branch."""
 
57
    seen = set()
 
58
    lines = [branch.last_patch()]
 
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 = branch.get_revision(line)
 
67
                new_lines.extend([r.revision_id for r in revision.parents])
 
68
            except NoSuchRevision:
 
69
                yield line
 
70
        lines = new_lines