← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Martin Pool
  • Date: 2005-09-13 01:37:23 UTC
  • Revision ID: mbp@sourcefrog.net-20050913013723-7e0026b48cbf08ff
- BROKEN: start refactoring fetch code to work well with weaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
22
22
from bzrlib.branch import Branch
23
23
from bzrlib.progress import ProgressBar
24
24
 
 
25
 
 
26
def greedy_fetch(to_branch, from_branch, revision, pb):
 
27
    f = Fetcher(to_branch, from_branch, revision, pb)
 
28
    return f.count_copied, f.failed_revisions
 
29
 
 
30
 
 
31
class Fetcher(object):
 
32
    """Pull history from one branch to another."""
 
33
    def __init__(self, to_branch, from_branch, revision_limit=None, pb=None):
 
34
        self.to_branch = to_branch
 
35
        self.from_branch = from_branch
 
36
        self.revision_limit = revision_limit
 
37
        if pb is None:
 
38
            self.pb = bzrlib.ui.ui_factory.progress_bar()
 
39
        else:
 
40
            self.pb = pb
 
41
        self._scan_histories()
 
42
        self.failed_revisions = []
 
43
        self.count_copied = 0
 
44
        self._copy()
 
45
 
 
46
 
 
47
    def _scan_histories(self):
 
48
        self.from_history = from_branch.revision_history()
 
49
        self.required_revisions = set(from_history)
 
50
        self.to_history = to_branch.revision_history()
 
51
        if self.revision_limit:
 
52
            raise NotImplementedError('sorry, revision_limit not handled yet')
 
53
        self.need_revisions = []
 
54
        for rev_id in self.from_history:
 
55
            if not has_revision(self.to_branch):
 
56
                self.need_revisions.append(rev_id)
 
57
                mutter('need to get revision {%s}', rev_id)
 
58
 
 
59
 
 
60
    def _copy(self):
 
61
        while self.need_revisions:
 
62
            rev_id = self.need_revisions.pop()
 
63
            mutter('try to get revision {%s}', rev_id)
 
64
 
 
65
    
 
66
        
 
67
    
 
68
 
25
69
def has_revision(branch, revision_id):
26
70
    try:
27
71
        branch.get_revision_xml(revision_id)
30
74
        return False
31
75
 
32
76
 
33
 
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
34
 
    """Copy a revision and all available ancestors from one branch to another
35
 
    If no revision is specified, uses the last revision in the source branch's
36
 
    revision history.
 
77
def old_greedy_fetch(to_branch, from_branch, revision=None, pb=None):
 
78
    """Copy all history from one branch to another.
 
79
 
 
80
    revision
 
81
        If set, copy only up to this point in the source branch.
 
82
 
 
83
    @returns: number copied, missing ids       
37
84
    """
38
85
    from_history = from_branch.revision_history()
39
86
    required_revisions = set(from_history)
53
100
    for rev_id in from_history:
54
101
        if not has_revision(to_branch, rev_id):
55
102
            missing.append(rev_id)
56
 
    
 
103
 
 
104
    # recurse down through the revision graph, looking for things that
 
105
    # can't be found.
57
106
    count = 0
58
107
    while len(missing) > 0:
59
108
        installed, failed = to_branch.install_revisions(from_branch, 
82
131
    return count, all_failed
83
132
 
84
133
 
 
134
def old_install_revisions(branch, other, revision_ids, pb):
 
135
    """Copy revisions from other branch into branch.
 
136
 
 
137
    This is a lower-level function used by a pull or a merge.  It
 
138
    incorporates some history from one branch into another, but
 
139
    does not update the revision history or operate on the working
 
140
    copy.
 
141
 
 
142
    revision_ids
 
143
        Sequence of revisions to copy.
 
144
 
 
145
    pb
 
146
        Progress bar for copying.
 
147
    """
 
148
    if False:
 
149
        if hasattr(other.revision_store, "prefetch"):
 
150
            other.revision_store.prefetch(revision_ids)
 
151
        if hasattr(other.inventory_store, "prefetch"):
 
152
            other.inventory_store.prefetch(revision_ids)
 
153
 
 
154
    if pb is None:
 
155
        pb = bzrlib.ui.ui_factory.progress_bar()
 
156
 
 
157
    revisions = []
 
158
    needed_texts = set()
 
159
    i = 0
 
160
 
 
161
    failures = set()
 
162
    for i, rev_id in enumerate(revision_ids):
 
163
        pb.update('fetching revision', i+1, len(revision_ids))
 
164
        try:
 
165
            rev = other.get_revision(rev_id)
 
166
        except bzrlib.errors.NoSuchRevision:
 
167
            failures.add(rev_id)
 
168
            continue
 
169
 
 
170
        revisions.append(rev)
 
171
        inv = other.get_inventory(rev_id)
 
172
        for key, entry in inv.iter_entries():
 
173
            if entry.text_id is None:
 
174
                continue
 
175
            if entry.text_id not in branch.text_store:
 
176
                needed_texts.add(entry.text_id)
 
177
 
 
178
    pb.clear()
 
179
 
 
180
    count, cp_fail = branch.text_store.copy_multi(other.text_store, 
 
181
                                                needed_texts)
 
182
    count, cp_fail = branch.inventory_store.copy_multi(other.inventory_store, 
 
183
                                                     revision_ids)
 
184
    count, cp_fail = branch.revision_store.copy_multi(other.revision_store, 
 
185
                                                    revision_ids,
 
186
                                                    permit_failure=True)
 
187
    assert len(cp_fail) == 0 
 
188
    return count, failures
 
189
 
 
190