/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-09 21:36:27 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20210109213627-h1xwcutzy9m7a99b
Added 'Case Preserving Working Tree Use Cases' from Canonical Wiki

* Addod a page from the Canonical Bazaar wiki
  with information on the scmeatics of case
  perserving filesystems an a case insensitive
  filesystem works.
  
  * Needs re-work, but this will do as it is the
    same inforamoton as what was on the linked
    page in the currint documentation.

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