/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
39
39
from ..repository import (
40
40
    CommitBuilder,
41
41
    )
 
42
from ..sixish import (
 
43
    viewitems,
 
44
    )
42
45
 
43
46
from dulwich.objects import (
44
47
    Blob,
152
155
 
153
156
    def finish_inventory(self):
154
157
        # eliminate blobs that were removed
155
 
        self._blobs = {k: v for (k, v) in self._blobs.items() if v is not None}
 
158
        self._blobs = {k: v for (k, v) in viewitems(
 
159
            self._blobs) if v is not None}
156
160
 
157
161
    def _iterblobs(self):
158
162
        return ((path, sha, mode) for (path, (mode, sha))
159
 
                in self._blobs.items())
 
163
                in viewitems(self._blobs))
160
164
 
161
165
    def commit(self, message):
162
166
        self._validate_unicode_text(message, 'commit message')