/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/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-29 15:50:22 UTC
  • mto: This revision was merged to the branch mainline in revision 7374.
  • Revision ID: jelmer@jelmer.uk-20190629155022-jagfuax2bl39bjin
Drop file id roundtripping support in Git.

Stashing bzr-specific metadata in Git is fraught with problems. Instead, we'll
be opportunistic when trying to match files from bzr and git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_workingtree.py
37
37
from ...delta import TreeDelta
38
38
from ..mapping import (
39
39
    default_mapping,
40
 
    GitFileIdMap,
41
40
    )
42
41
from ..tree import (
43
42
    changes_between_git_tree_and_working_copy,
137
136
        changes = []
138
137
        self.assertEqual(
139
138
            delta,
140
 
            tree_delta_from_git_changes(changes, default_mapping,
141
 
                                        (GitFileIdMap({}, default_mapping),
142
 
                                         GitFileIdMap({}, default_mapping))))
 
139
            tree_delta_from_git_changes(changes, (default_mapping, default_mapping)))
143
140
 
144
141
    def test_missing(self):
145
142
        delta = TreeDelta()
146
 
        delta.removed.append(('a', b'a-id', 'file'))
 
143
        delta.removed.append(('a', b'git:a', 'file'))
147
144
        changes = [((b'a', b'a'), (stat.S_IFREG | 0o755, 0),
148
145
                    (b'a' * 40, b'a' * 40))]
149
146
        self.assertEqual(
150
147
            delta,
151
 
            tree_delta_from_git_changes(changes, default_mapping,
152
 
                                        (GitFileIdMap({u'a': b'a-id'}, default_mapping),
153
 
                                         GitFileIdMap({u'a': b'a-id'}, default_mapping))))
 
148
            tree_delta_from_git_changes(changes, (default_mapping, default_mapping)))
154
149
 
155
150
 
156
151
class ChangesBetweenGitTreeAndWorkingCopyTests(TestCaseWithTransport):