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

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-11 20:19:38 UTC
  • mfrom: (7526.3.2 work)
  • Revision ID: gustav.hartvigsson@gmail.com-20210111201938-omr9wjz3qdgyxe8k
Merged lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
19
19
 
20
20
from dulwich.index import (
21
21
    commit_tree,
 
22
    read_submodule_head,
22
23
    )
23
24
import stat
24
25
 
42
43
    Blob,
43
44
    Commit,
44
45
    )
45
 
from dulwich.index import read_submodule_head
46
46
 
47
47
 
48
48
from .mapping import (
 
49
    encode_git_path,
49
50
    object_mode,
50
51
    fix_person_identifier,
51
52
    )
64
65
        self.store = self.repository._git.object_store
65
66
        self._blobs = {}
66
67
        self._inv_delta = []
 
68
        self._deleted_paths = set()
67
69
        self._any_changes = False
68
70
        self._mapping = self.repository.get_mapping()
69
71
 
73
75
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
74
76
        seen_root = False
75
77
        for change in iter_changes:
 
78
            if change.kind == (None, None):
 
79
                # Ephemeral
 
80
                continue
 
81
            if change.versioned[0] and not change.copied:
 
82
                file_id = self._mapping.generate_file_id(change.path[0])
 
83
            elif change.versioned[1]:
 
84
                file_id = self._mapping.generate_file_id(change.path[1])
 
85
            else:
 
86
                file_id = None
 
87
            if change.path[1]:
 
88
                parent_id_new = self._mapping.generate_file_id(osutils.dirname(change.path[1]))
 
89
            else:
 
90
                parent_id_new = None
76
91
            if change.kind[1] in ("directory",):
77
92
                self._inv_delta.append(
78
 
                    (change.path[0], change.path[1], change.file_id,
 
93
                    (change.path[0], change.path[1], file_id,
79
94
                     entry_factory[change.kind[1]](
80
 
                         change.file_id, change.name[1], change.parent_id[1])))
 
95
                         file_id, change.name[1], parent_id_new)))
81
96
                if change.kind[0] in ("file", "symlink"):
82
 
                    self._blobs[change.path[0].encode("utf-8")] = None
 
97
                    self._blobs[encode_git_path(change.path[0])] = None
83
98
                    self._any_changes = True
84
99
                if change.path[1] == "":
85
100
                    seen_root = True
86
101
                continue
87
102
            self._any_changes = True
88
103
            if change.path[1] is None:
89
 
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
90
 
                self._blobs[change.path[0].encode("utf-8")] = None
 
104
                self._inv_delta.append((change.path[0], change.path[1], file_id, None))
 
105
                self._deleted_paths.add(encode_git_path(change.path[0]))
91
106
                continue
92
107
            try:
93
108
                entry_kls = entry_factory[change.kind[1]]
94
109
            except KeyError:
95
110
                raise KeyError("unknown kind %s" % change.kind[1])
96
 
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
 
111
            entry = entry_kls(file_id, change.name[1], parent_id_new)
97
112
            if change.kind[1] == "file":
98
113
                entry.executable = change.executable[1]
99
114
                blob = Blob()
102
117
                    blob.data = f.read()
103
118
                finally:
104
119
                    f.close()
105
 
                entry.text_size = len(blob.data)
106
 
                entry.text_sha1 = osutils.sha_string(blob.data)
 
120
                sha = blob.id
 
121
                if st is not None:
 
122
                    entry.text_size = st.st_size
 
123
                else:
 
124
                    entry.text_size = len(blob.data)
 
125
                entry.git_sha1 = sha
107
126
                self.store.add_object(blob)
108
 
                sha = blob.id
109
127
            elif change.kind[1] == "symlink":
110
128
                symlink_target = workingtree.get_symlink_target(change.path[1])
111
129
                blob = Blob()
112
 
                blob.data = symlink_target.encode("utf-8")
 
130
                blob.data = encode_git_path(symlink_target)
113
131
                self.store.add_object(blob)
114
132
                sha = blob.id
115
133
                entry.symlink_target = symlink_target
122
140
            else:
123
141
                raise AssertionError("Unknown kind %r" % change.kind[1])
124
142
            mode = object_mode(change.kind[1], change.executable[1])
125
 
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
126
 
            encoded_new_path = change.path[1].encode("utf-8")
127
 
            self._blobs[encoded_new_path] = (mode, sha)
 
143
            self._inv_delta.append((change.path[0], change.path[1], file_id, entry))
 
144
            if change.path[0] is not None:
 
145
                self._deleted_paths.add(encode_git_path(change.path[0]))
 
146
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
128
147
            if st is not None:
129
 
                yield change.path[1], (entry.text_sha1, st)
 
148
                yield change.path[1], (entry.git_sha1, st)
130
149
        if not seen_root and len(self.parents) == 0:
131
150
            raise RootMissing()
132
151
        if getattr(workingtree, "basis_tree", False):
141
160
        for entry in basis_tree._iter_tree_contents(include_trees=False):
142
161
            if entry.path in self._blobs:
143
162
                continue
 
163
            if entry.path in self._deleted_paths:
 
164
                continue
144
165
            self._blobs[entry.path] = (entry.mode, entry.sha)
145
166
        self.new_inventory = None
146
167
 
150
171
 
151
172
    def finish_inventory(self):
152
173
        # eliminate blobs that were removed
153
 
        self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
 
174
        self._blobs = {k: v for (k, v) in self._blobs.items()}
154
175
 
155
176
    def _iterblobs(self):
156
177
        return ((path, sha, mode) for (path, (mode, sha))