← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-08 14:55:19 UTC
  • mfrom: (3530 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3532.
  • Revision ID: john@arbash-meinel.com-20080708145519-paqg4kjwbpgs2xmq
Merge bzr.dev 3530

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/multiparent.py
23
23
from StringIO import StringIO
24
24
 
25
25
from bzrlib import (
 
26
    errors,
26
27
    patiencediff,
27
28
    trace,
28
29
    ui,
32
33
from bzrlib.tuned_gzip import GzipFile
33
34
 
34
35
 
 
36
def topo_iter_keys(vf, keys=None):
 
37
    if keys is None:
 
38
        keys = vf.keys()
 
39
    parents = vf.get_parent_map(keys)
 
40
    return _topo_iter(parents, keys)
 
41
 
35
42
def topo_iter(vf, versions=None):
 
43
    if versions is None:
 
44
        versions = vf.versions()
 
45
    parents = vf.get_parent_map(versions)
 
46
    return _topo_iter(parents, versions)
 
47
 
 
48
def _topo_iter(parents, versions):
36
49
    seen = set()
37
50
    descendants = {}
38
 
    if versions is None:
39
 
        versions = vf.versions()
40
51
    def pending_parents(version):
41
 
        return [v for v in vf.get_parents(version) if v in versions and
 
52
        if parents[version] is None:
 
53
            return []
 
54
        return [v for v in parents[version] if v in versions and
42
55
                v not in seen]
43
56
    for version_id in versions:
44
 
        for parent_id in vf.get_parents(version_id):
 
57
        if parents[version_id] is None:
 
58
            # parentless
 
59
            continue
 
60
        for parent_id in parents[version_id]:
45
61
            descendants.setdefault(parent_id, []).append(version_id)
46
62
    cur = [v for v in versions if len(pending_parents(v)) == 0]
47
63
    while len(cur) > 0:
55
71
            yield version_id
56
72
            seen.add(version_id)
57
73
        cur = next
58
 
    assert len(seen) == len(versions)
59
74
 
60
75
 
61
76
class MultiParent(object):
193
208
            elif cur_line[0] == '\n':
194
209
                hunks[-1].lines[-1] += '\n'
195
210
            else:
196
 
                assert cur_line[0] == 'c', cur_line[0]
 
211
                if not (cur_line[0] == 'c'):
 
212
                    raise AssertionError(cur_line[0])
197
213
                parent, parent_pos, child_pos, num_lines =\
198
214
                    [int(v) for v in cur_line.split(' ')[1:]]
199
215
                hunks.append(ParentText(parent, parent_pos, child_pos,
368
384
        :param single_parent: If true, omit all but one parent text, (but
369
385
            retain parent metadata).
370
386
        """
371
 
        assert no_cache or not verify
 
387
        if not (no_cache or not verify):
 
388
            raise ValueError()
372
389
        revisions = set(vf.versions())
373
390
        total = len(revisions)
374
391
        pb = ui.ui_factory.nested_progress_bar()
380
397
                    if [p for p in parents if p not in self._parents] != []:
381
398
                        continue
382
399
                    lines = [a + ' ' + l for a, l in
383
 
                             vf.annotate_iter(revision)]
 
400
                             vf.annotate(revision)]
384
401
                    if snapshots is None:
385
402
                        force_snapshot = None
386
403
                    else:
392
409
                        self.clear_cache()
393
410
                        vf.clear_cache()
394
411
                        if verify:
395
 
                            assert lines == self.get_line_list([revision])[0]
 
412
                            if not (lines == self.get_line_list([revision])[0]):
 
413
                                raise AssertionError()
396
414
                            self.clear_cache()
397
415
                    pb.update('Importing revisions',
398
416
                              (total - len(revisions)) + len(added), total)
508
526
        self._parents[version_id] = parent_ids
509
527
 
510
528
    def get_diff(self, version_id):
511
 
        return self._diffs[version_id]
 
529
        try:
 
530
            return self._diffs[version_id]
 
531
        except KeyError:
 
532
            raise errors.RevisionNotPresent(version_id, self)
512
533
 
513
534
    def destroy(self):
514
535
        self._diffs = {}