/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-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
17
17
 
18
18
"""Support for committing in native Git working trees."""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
from dulwich.index import (
23
21
    commit_tree,
24
22
    )
39
37
from ..repository import (
40
38
    CommitBuilder,
41
39
    )
42
 
from ..sixish import (
43
 
    viewitems,
44
 
    )
45
40
 
46
41
from dulwich.objects import (
47
42
    Blob,
155
150
 
156
151
    def finish_inventory(self):
157
152
        # eliminate blobs that were removed
158
 
        self._blobs = {k: v for (k, v) in viewitems(
159
 
            self._blobs) if v is not None}
 
153
        self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
160
154
 
161
155
    def _iterblobs(self):
162
156
        return ((path, sha, mode) for (path, (mode, sha))
163
 
                in viewitems(self._blobs))
 
157
                in self._blobs.items())
164
158
 
165
159
    def commit(self, message):
166
160
        self._validate_unicode_text(message, 'commit message')