/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/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repository.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
from .lazy_import import lazy_import
18
20
lazy_import(globals(), """
19
21
import time
38
40
from .decorators import only_raises
39
41
from .inter import InterObject
40
42
from .lock import _RelockDebugMixin, LogicalLockResult
 
43
from .sixish import (
 
44
    text_type,
 
45
    viewitems,
 
46
    )
41
47
from .trace import (
42
48
    log_exception_quietly, note, mutter, mutter_callsite, warning)
43
49
 
104
110
 
105
111
        if committer is None:
106
112
            self._committer = self._config_stack.get('email')
107
 
        elif not isinstance(committer, str):
 
113
        elif not isinstance(committer, text_type):
108
114
            self._committer = committer.decode()  # throw if non-ascii
109
115
        else:
110
116
            self._committer = committer
146
152
            raise ValueError('Invalid value for %s: %r' % (context, text))
147
153
 
148
154
    def _validate_revprops(self, revprops):
149
 
        for key, value in revprops.items():
 
155
        for key, value in viewitems(revprops):
150
156
            # We know that the XML serializers do not round trip '\r'
151
157
            # correctly, so refuse to accept them
152
 
            if not isinstance(value, str):
 
158
            if not isinstance(value, (text_type, str)):
153
159
                raise ValueError('revision property (%s) is not a valid'
154
160
                                 ' (unicode) string: %r' % (key, value))
155
161
            # TODO(jelmer): Make this repository-format specific
1071
1077
            else:
1072
1078
                query_keys.append((revision_id,))
1073
1079
        vf = self.revisions.without_fallbacks()
1074
 
        for (revision_id,), parent_keys in (
1075
 
                vf.get_parent_map(query_keys).items()):
 
1080
        for (revision_id,), parent_keys in viewitems(
 
1081
                vf.get_parent_map(query_keys)):
1076
1082
            if parent_keys:
1077
1083
                result[revision_id] = tuple([parent_revid
1078
1084
                                             for (parent_revid,) in parent_keys])
1203
1209
        # weave repositories refuse to store revisionids that are non-ascii.
1204
1210
        if revision_id is not None:
1205
1211
            # weaves require ascii revision ids.
1206
 
            if isinstance(revision_id, str):
 
1212
            if isinstance(revision_id, text_type):
1207
1213
                try:
1208
1214
                    revision_id.encode('ascii')
1209
1215
                except UnicodeEncodeError:
1639
1645
    # Filter ghosts, and null:
1640
1646
    if _mod_revision.NULL_REVISION in revision_graph:
1641
1647
        del revision_graph[_mod_revision.NULL_REVISION]
1642
 
    for key, parents in revision_graph.items():
 
1648
    for key, parents in viewitems(revision_graph):
1643
1649
        revision_graph[key] = tuple(parent for parent in parents if parent
1644
1650
                                    in revision_graph)
1645
1651
    return revision_graph