/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: Jelmer Vernooij
  • Date: 2020-07-28 02:11:05 UTC
  • mfrom: (7490.40.78 work)
  • mto: This revision was merged to the branch mainline in revision 7520.
  • Revision ID: jelmer@jelmer.uk-20200728021105-fzq7g6f8bl1g0aet
Merge lp:brz/3.1.

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,
23
22
    )
24
23
import stat
25
24
 
43
42
    Blob,
44
43
    Commit,
45
44
    )
 
45
from dulwich.index import read_submodule_head
46
46
 
47
47
 
48
48
from .mapping import (
75
75
    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
76
76
        seen_root = False
77
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
91
78
            if change.kind[1] in ("directory",):
92
79
                self._inv_delta.append(
93
 
                    (change.path[0], change.path[1], file_id,
 
80
                    (change.path[0], change.path[1], change.file_id,
94
81
                     entry_factory[change.kind[1]](
95
 
                         file_id, change.name[1], parent_id_new)))
 
82
                         change.file_id, change.name[1], change.parent_id[1])))
96
83
                if change.kind[0] in ("file", "symlink"):
97
84
                    self._blobs[encode_git_path(change.path[0])] = None
98
85
                    self._any_changes = True
101
88
                continue
102
89
            self._any_changes = True
103
90
            if change.path[1] is None:
104
 
                self._inv_delta.append((change.path[0], change.path[1], file_id, None))
 
91
                self._inv_delta.append((change.path[0], change.path[1], change.file_id, None))
105
92
                self._deleted_paths.add(encode_git_path(change.path[0]))
106
93
                continue
107
94
            try:
108
95
                entry_kls = entry_factory[change.kind[1]]
109
96
            except KeyError:
110
97
                raise KeyError("unknown kind %s" % change.kind[1])
111
 
            entry = entry_kls(file_id, change.name[1], parent_id_new)
 
98
            entry = entry_kls(change.file_id, change.name[1], change.parent_id[1])
112
99
            if change.kind[1] == "file":
113
100
                entry.executable = change.executable[1]
114
101
                blob = Blob()
117
104
                    blob.data = f.read()
118
105
                finally:
119
106
                    f.close()
 
107
                entry.text_size = len(blob.data)
 
108
                entry.text_sha1 = osutils.sha_string(blob.data)
 
109
                self.store.add_object(blob)
120
110
                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
126
 
                self.store.add_object(blob)
127
111
            elif change.kind[1] == "symlink":
128
112
                symlink_target = workingtree.get_symlink_target(change.path[1])
129
113
                blob = Blob()
140
124
            else:
141
125
                raise AssertionError("Unknown kind %r" % change.kind[1])
142
126
            mode = object_mode(change.kind[1], change.executable[1])
143
 
            self._inv_delta.append((change.path[0], change.path[1], file_id, entry))
 
127
            self._inv_delta.append((change.path[0], change.path[1], change.file_id, entry))
144
128
            if change.path[0] is not None:
145
129
                self._deleted_paths.add(encode_git_path(change.path[0]))
146
130
            self._blobs[encode_git_path(change.path[1])] = (mode, sha)
147
131
            if st is not None:
148
 
                yield change.path[1], (entry.git_sha1, st)
 
132
                yield change.path[1], (entry.text_sha1, st)
149
133
        if not seen_root and len(self.parents) == 0:
150
134
            raise RootMissing()
151
135
        if getattr(workingtree, "basis_tree", False):