← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/multiparent.py

  • Committer: Martin Pool
  • Date: 2007-10-12 08:00:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012080007-vf80woayyom8s8e1
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta

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