/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: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commit.py
25
25
import stat
26
26
 
27
27
from .. import (
 
28
    bugtracker,
28
29
    config as _mod_config,
29
30
    gpg,
30
31
    osutils,
141
142
            encoded_new_path = path[1].encode("utf-8")
142
143
            self._blobs[encoded_new_path] = (mode, sha)
143
144
            if st is not None:
144
 
                yield file_id, path[1], (entry.text_sha1, st)
 
145
                yield path[1], (entry.text_sha1, st)
145
146
            if self._mapping.generate_file_id(encoded_new_path) != file_id:
146
147
                self._override_fileids[encoded_new_path] = file_id
147
148
            else:
227
228
                else:
228
229
                    author = authors[0]
229
230
        c.author = fix_person_identifier(author.encode(encoding))
 
231
        bugstext = self._revprops.pop('bugs', None)
 
232
        if bugstext is not None:
 
233
            message += "\n"
 
234
            for url, status in bugtracker.decode_bug_urls(bugstext):
 
235
                if status == bugtracker.FIXED:
 
236
                    message += "Fixes: %s\n" % url
 
237
                elif status == bugtracker.RELATED:
 
238
                    message += "Bug: %s\n" % url
 
239
                else:
 
240
                    raise bugtracker.InvalidBugStatus(status)
230
241
        if self._revprops:
231
242
            raise NotImplementedError(self._revprops)
232
243
        c.commit_time = int(self._timestamp)