/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_workingtree.py
21
21
import stat
22
22
 
23
23
from dulwich import __version__ as dulwich_version
24
 
from dulwich.diff_tree import RenameDetector
 
24
from dulwich.diff_tree import RenameDetector, tree_changes
25
25
from dulwich.index import IndexEntry
 
26
from dulwich.object_store import (
 
27
    OverlayObjectStore,
 
28
    )
26
29
from dulwich.objects import (
27
30
    S_IFGITLINK,
28
31
    Blob,
35
38
    workingtree as _mod_workingtree,
36
39
    )
37
40
from ...delta import TreeDelta
38
 
from ...tree import TreeChange
 
41
from ...bzr.inventorytree import InventoryTreeChange as TreeChange
39
42
from ..mapping import (
40
43
    default_mapping,
41
44
    )
42
45
from ..tree import (
43
 
    changes_between_git_tree_and_working_copy,
44
46
    tree_delta_from_git_changes,
45
47
    )
46
48
from ..workingtree import (
52
54
    )
53
55
 
54
56
 
 
57
def changes_between_git_tree_and_working_copy(source_store, from_tree_sha, target,
 
58
                                              want_unchanged=False,
 
59
                                              want_unversioned=False,
 
60
                                              rename_detector=None,
 
61
                                              include_trees=True):
 
62
    """Determine the changes between a git tree and a working tree with index.
 
63
 
 
64
    """
 
65
    to_tree_sha, extras = target.git_snapshot(want_unversioned=want_unversioned)
 
66
    store = OverlayObjectStore([source_store, target.store])
 
67
    return tree_changes(
 
68
        store, from_tree_sha, to_tree_sha, include_trees=include_trees,
 
69
        rename_detector=rename_detector,
 
70
        want_unchanged=want_unchanged, change_type_same=True), extras
 
71
 
 
72
 
55
73
class GitWorkingTreeTests(TestCaseWithTransport):
56
74
 
57
75
    def setUp(self):