Mercurial > hgrepos > Python > apps > py-cutils

comparison cutils/treesum.py @ 315:aaf0b3b53e48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
treesum: FIX: format string for interpolate_bytes() must be of bytes type
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 10 Mar 2025 10:19:33 +0100
parents 1fbe9904b188
children 3f1f1c2e9e5f
comparison
equal deleted inserted replaced
314:1fbe9904b188 315:aaf0b3b53e48
759 # This is a severe error here: just the size 759 # This is a severe error here: just the size
760 # is required, but we have not got one. 760 # is required, but we have not got one.
761 # 761 #
762 self._writer.write_error(util.b( 762 self._writer.write_error(util.b(
763 util.interpolate_bytes( 763 util.interpolate_bytes(
764 "No size in treesum-file `%s' while" 764 b"No size in treesum-file `%s' while"
765 " requiring it", 765 b" requiring it",
766 fpath), 766 fpath),
767 "utf-8")) 767 "utf-8"))
768 self._writer.write_size(opath, None) 768 self._writer.write_size(opath, None)
769 return (errno.ESRCH, None, None, None) 769 return (errno.ESRCH, None, None, None)
770 else: 770 else:
774 # XXX FIXME: Is this a **severe** error 774 # XXX FIXME: Is this a **severe** error
775 # here? Currently: no 775 # here? Currently: no
776 # 776 #
777 self._writer.write_error(util.b( 777 self._writer.write_error(util.b(
778 util.interpolate_bytes( 778 util.interpolate_bytes(
779 "No size in treesum-file `%s'", 779 b"No size in treesum-file `%s'",
780 fpath), 780 fpath),
781 "utf-8")) 781 "utf-8"))
782 sz = "" 782 sz = ""
783 else: 783 else:
784 sz = collector.size 784 sz = collector.size
790 # the treesum file was created with 790 # the treesum file was created with
791 # "--size-only" and contains no digest. 791 # "--size-only" and contains no digest.
792 # 792 #
793 self._writer.write_error(util.b( 793 self._writer.write_error(util.b(
794 util.interpolate_bytes( 794 util.interpolate_bytes(
795 "No digest in treesum-file `%s' while" 795 b"No digest in treesum-file `%s' while"
796 " it is required", 796 b" it is required",
797 fpath), 797 fpath),
798 "utf-8")) 798 "utf-8"))
799 self._writer.write_file_digest( 799 self._writer.write_file_digest(
800 collector.algorithm or "MD5", 800 collector.algorithm or "MD5",
801 opath, 801 opath,
817 else: 817 else:
818 # 818 #
819 # treesum file could not be read 819 # treesum file could not be read
820 # 820 #
821 self._writer.write_error(util.interpolate_bytes( 821 self._writer.write_error(util.interpolate_bytes(
822 "Cannot read treesum-file `%s' for directory" 822 b"Cannot read treesum-file `%s' for directory"
823 "`%s': %s", 823 b"`%s': %s",
824 fpath, 824 fpath,
825 opath, 825 opath,
826 util.b(emsg, "utf-8"))) 826 util.b(emsg, "utf-8")))
827 if self._size_only: 827 if self._size_only:
828 self._writer.write_size(opath, None) 828 self._writer.write_size(opath, None)