← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-04 02:59:56 UTC
  • mfrom: (1172)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050904025956-776ba4f07de97700
Merged mpool's latest changes (~0.0.7)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
204
204
 
205
205
 
206
206
def find_present_ancestors(revision_id, revision_source):
 
207
    """Return the ancestors of a revision present in a branch.
 
208
 
 
209
    It's possible that a branch won't have the complete ancestry of
 
210
    one of its revisions.  
 
211
 
 
212
    """
207
213
    found_ancestors = {}
208
 
    count = 0
209
214
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
210
215
                         only_present=True))
211
216
    for anc_order, (anc_id, anc_distance) in anc_iter:
213
218
            found_ancestors[anc_id] = (anc_order, anc_distance)
214
219
    return found_ancestors
215
220
    
216
 
class AmbiguousBase(bzrlib.errors.BzrError):
217
 
    def __init__(self, bases):
218
 
        msg = "The correct base is unclear, becase %s are all equally close" %\
219
 
            ", ".join(bases)
220
 
        bzrlib.errors.BzrError.__init__(self, msg)
221
 
        self.bases = bases
 
221
 
 
222
def __get_closest(intersection):
 
223
    intersection.sort()
 
224
    matches = [] 
 
225
    for entry in intersection:
 
226
        if entry[0] == intersection[0][0]:
 
227
            matches.append(entry[2])
 
228
    return matches
 
229
 
222
230
 
223
231
def common_ancestor(revision_a, revision_b, revision_source):
224
232
    """Find the ancestor common to both revisions that is closest to both.
235
243
            b_intersection.append((b_ancestors[revision][1], a_order, revision))
236
244
    mutter("a intersection: %r" % a_intersection)
237
245
    mutter("b intersection: %r" % b_intersection)
238
 
    def get_closest(intersection):
239
 
        intersection.sort()
240
 
        matches = [] 
241
 
        for entry in intersection:
242
 
            if entry[0] == intersection[0][0]:
243
 
                matches.append(entry[2])
244
 
        return matches
245
246
 
246
 
    a_closest = get_closest(a_intersection)
 
247
    a_closest = __get_closest(a_intersection)
247
248
    if len(a_closest) == 0:
248
249
        return None
249
 
    b_closest = get_closest(b_intersection)
 
250
    b_closest = __get_closest(b_intersection)
250
251
    assert len(b_closest) != 0
251
252
    mutter ("a_closest %r" % a_closest)
252
253
    mutter ("b_closest %r" % b_closest)
255
256
    elif b_closest[0] in a_closest:
256
257
        return b_closest[0]
257
258
    else:
258
 
        raise AmbiguousBase((a_closest[0], b_closest[0]))
 
259
        raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
259
260
    return a_closest[0]
260
261
 
261
262
class MultipleRevisionSources(object):
 
263
    """Proxy that looks in multiple branches for revisions."""
262
264
    def __init__(self, *args):
263
265
        object.__init__(self)
264
266
        assert len(args) != 0