/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/plugins/git/transportgit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-13 20:57:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7039.
  • Revision ID: jelmer@jelmer.uk-20180713205753-taec5mwjeqlmtacr
Fix some tests that fail with -Werror.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/transportgit.py
675
675
        f.seek(0)
676
676
        p = PackData("", f, len(f.getvalue()))
677
677
        entries = p.sorted_entries()
678
 
        basename = "pack-%s" % iter_sha1(entry[0] for entry in entries)
 
678
        basename = "pack-%s" % iter_sha1(entry[0] for entry in entries).decode('ascii')
679
679
        p._filename = basename + ".pack"
680
680
        f.seek(0)
681
681
        self.pack_transport.put_file(basename + ".pack", f)
708
708
        pack_sha = p.index.objects_sha1()
709
709
 
710
710
        datafile = self.pack_transport.open_write_stream(
711
 
                "pack-%s.pack" % pack_sha)
 
711
                "pack-%s.pack" % pack_sha.decode('ascii'))
712
712
        try:
713
713
            entries, data_sum = write_pack_objects(datafile, p.pack_tuples())
714
714
        finally:
715
715
            datafile.close()
716
716
        entries = sorted([(k, v[0], v[1]) for (k, v) in entries.items()])
717
717
        idxfile = self.pack_transport.open_write_stream(
718
 
            "pack-%s.idx" % pack_sha)
 
718
            "pack-%s.idx" % pack_sha.decode('ascii'))
719
719
        try:
720
720
            write_pack_index_v2(idxfile, entries, data_sum)
721
721
        finally: