/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 bzrlib/weave.py

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 17:00:29 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205170029-s01xdro0hkixhq3r
Convert some octal numbers to new notations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
16
16
 
17
17
# Author: Martin Pool <mbp@canonical.com>
18
18
 
19
 
 
20
19
"""Weave - storage of related text file versions"""
21
20
 
 
21
from __future__ import absolute_import
22
22
 
23
23
# XXX: If we do weaves this way, will a merge still behave the same
24
24
# way if it's done in a different order?  That's a pretty desirable
805
805
            name = self._idx_to_name(i)
806
806
            sha1s[name] = sha()
807
807
            texts[name] = []
808
 
            new_inc = set([name])
 
808
            new_inc = {name}
809
809
            for p in self._parents[i]:
810
810
                new_inc.update(inclusions[self._idx_to_name(p)])
811
811
 
878
878
                raise errors.WeaveTextDiffers(name, self, other)
879
879
            self_parents = self._parents[this_idx]
880
880
            other_parents = other._parents[other_idx]
881
 
            n1 = set([self._names[i] for i in self_parents])
882
 
            n2 = set([other._names[i] for i in other_parents])
 
881
            n1 = {self._names[i] for i in self_parents}
 
882
            n2 = {other._names[i] for i in other_parents}
883
883
            if not self._compatible_parents(n1, n2):
884
884
                raise WeaveParentMismatch("inconsistent parents "
885
885
                    "for version {%s}: %s vs %s" % (name, n1, n2))
920
920
        self._transport = transport
921
921
        self._filemode = filemode
922
922
        try:
923
 
            _read_weave_v5(self._transport.get(name + WeaveFile.WEAVE_SUFFIX), self)
 
923
            f = self._transport.get(name + WeaveFile.WEAVE_SUFFIX)
 
924
            _read_weave_v5(StringIO(f.read()), self)
924
925
        except errors.NoSuchFile:
925
926
            if not create:
926
927
                raise