/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/repofmt/groupcompress_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repofmt/groupcompress_repo.py
20
20
 
21
21
import time
22
22
 
23
 
from breezy import (
 
23
from .. import (
24
24
    controldir,
25
25
    chk_map,
26
26
    chk_serializer,
35
35
    ui,
36
36
    versionedfile,
37
37
    )
38
 
from breezy.btree_index import (
 
38
from ..btree_index import (
39
39
    BTreeGraphIndex,
40
40
    BTreeBuilder,
41
41
    )
42
 
from breezy.decorators import needs_write_lock
43
 
from breezy.groupcompress import (
 
42
from ..decorators import needs_write_lock
 
43
from ..groupcompress import (
44
44
    _GCGraphIndex,
45
45
    GroupCompressVersionedFiles,
46
46
    )
47
 
from breezy.repofmt.pack_repo import (
 
47
from .pack_repo import (
48
48
    _DirectPackAccess,
49
49
    Pack,
50
50
    NewPack,
55
55
    ResumedPack,
56
56
    Packer,
57
57
    )
58
 
from breezy.vf_repository import (
 
58
from ..vf_repository import (
59
59
    StreamSource,
60
60
    )
61
 
from breezy.static_tuple import StaticTuple
 
61
from ..static_tuple import StaticTuple
62
62
 
63
63
 
64
64
class GCPack(NewPack):
778
778
            for record in _filter_text_keys(chk_diff, text_keys,
779
779
                                            chk_map._bytes_to_text_key):
780
780
                pass
781
 
        except errors.NoSuchRevision, e:
 
781
        except errors.NoSuchRevision as e:
782
782
            # XXX: It would be nice if we could give a more precise error here.
783
783
            problems.append("missing chk node(s) for id_to_entry maps")
784
784
        chk_diff = chk_map.iter_interesting_nodes(
787
787
        try:
788
788
            for interesting_rec, interesting_map in chk_diff:
789
789
                pass
790
 
        except errors.NoSuchRevision, e:
 
790
        except errors.NoSuchRevision as e:
791
791
            problems.append(
792
792
                "missing chk node(s) for parent_id_basename_to_file_id maps")
793
793
        present_text_keys = no_fallback_texts_index.get_parent_map(text_keys)
1030
1030
            #       inventories, not missing inventories for revision_ids
1031
1031
            present_parent_inv_keys = self._find_present_inventory_keys(
1032
1032
                                        parent_keys)
1033
 
            present_parent_inv_ids = set(
1034
 
                [k[-1] for k in present_parent_inv_keys])
 
1033
            present_parent_inv_ids = {k[-1] for k in present_parent_inv_keys}
1035
1034
            inventories_to_read = set(revision_ids)
1036
1035
            inventories_to_read.update(present_parent_inv_ids)
1037
1036
            root_key_info = _build_interesting_key_sets(
1053
1052
                    try:
1054
1053
                        file_id_revisions[file_id].add(revision_id)
1055
1054
                    except KeyError:
1056
 
                        file_id_revisions[file_id] = set([revision_id])
 
1055
                        file_id_revisions[file_id] = {revision_id}
1057
1056
        finally:
1058
1057
            pb.finished()
1059
1058
        return file_id_revisions