/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/git/tree.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/git/tree.py
17
17
 
18
18
"""Git Trees."""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
20
22
from collections import deque
21
23
import errno
22
24
from io import BytesIO
64
66
    CURRENT_REVISION,
65
67
    NULL_REVISION,
66
68
    )
 
69
from ..sixish import (
 
70
    text_type,
 
71
    viewitems,
 
72
    )
67
73
 
68
74
from .mapping import (
69
75
    encode_git_path,
719
725
            yield (path_decoded, parent_id), children
720
726
 
721
727
    def preview_transform(self, pb=None):
722
 
        from .transform import GitTransformPreview
723
 
        return GitTransformPreview(self, pb=pb)
 
728
        from ..bzr.transform import TransformPreview
 
729
        return TransformPreview(self, pb=pb)
724
730
 
725
731
 
726
732
def tree_delta_from_git_changes(changes, mappings,
1349
1355
                    key = (posixpath.dirname(path), path)
1350
1356
                    if key not in ret and self.is_versioned(path):
1351
1357
                        ret[key] = self._get_dir_ie(path, self.path2id(key[0]))
1352
 
            return ((path, ie) for ((_, path), ie) in sorted(ret.items()))
 
1358
            return ((path, ie) for ((_, path), ie) in sorted(viewitems(ret)))
1353
1359
 
1354
1360
    def iter_references(self):
1355
1361
        if self.supports_tree_reference():
1364
1370
                                posixpath.basename(path).strip("/"), parent_id)
1365
1371
 
1366
1372
    def _get_file_ie(self, name, path, value, parent_id):
1367
 
        if not isinstance(name, str):
 
1373
        if not isinstance(name, text_type):
1368
1374
            raise TypeError(name)
1369
 
        if not isinstance(path, str):
 
1375
        if not isinstance(path, text_type):
1370
1376
            raise TypeError(path)
1371
1377
        if not isinstance(value, tuple) or len(value) != 10:
1372
1378
            raise TypeError(value)
1628
1634
    def _live_entry(self, relpath):
1629
1635
        raise NotImplementedError(self._live_entry)
1630
1636
 
 
1637
    def preview_transform(self, pb=None):
 
1638
        from ..bzr.transform import TransformPreview
 
1639
        return TransformPreview(self, pb=pb)
 
1640
 
1631
1641
    def transform(self, pb=None):
1632
1642
        from .transform import GitTreeTransform
1633
1643
        return GitTreeTransform(self, pb=pb)
1634
1644
 
1635
 
    def preview_transform(self, pb=None):
1636
 
        from .transform import GitTransformPreview
1637
 
        return GitTransformPreview(self, pb=pb)
1638
 
 
1639
1645
 
1640
1646
class InterToIndexGitTree(InterGitTrees):
1641
1647
    """InterTree that works between a Git revision tree and an index."""