comparison hgsubversion/stupid.py @ 1526:5adfb81c4680

util: add method for forcing unicode objects back to utf8 bytes Use this to force all filenames to be bytes, even when underlying svn bindings really want to give us unicodes instead.
author Augie Fackler <raf@durin42.com>
date Thu, 31 Aug 2017 00:45:27 -0400
parents cf79525f507c
children d03995e69785
comparison
equal deleted inserted replaced
1525:3476b7a945fb 1526:5adfb81c4680
778 extra.update({'branch': parentctx.extra().get('branch', None), 778 extra.update({'branch': parentctx.extra().get('branch', None),
779 'close': 1}) 779 'close': 1})
780 780
781 origbranch = extra.get('branch', None) 781 origbranch = extra.get('branch', None)
782 meta.mapbranch(extra) 782 meta.mapbranch(extra)
783 current_ctx = context.memctx(meta.repo, 783 current_ctx = context.memctx(
784 [parentctx.node(), revlog.nullid], 784 meta.repo,
785 meta.getmessage(r), 785 [parentctx.node(), revlog.nullid],
786 files_touched, 786 meta.getmessage(r),
787 filectxfn, 787 [util.forceutf8(f) for f in files_touched],
788 meta.authors[r.author], 788 filectxfn,
789 date, 789 meta.authors[r.author],
790 extra) 790 date,
791 extra)
791 ha = meta.repo.svn_commitctx(current_ctx) 792 ha = meta.repo.svn_commitctx(current_ctx)
792 793
793 if not tag: 794 if not tag:
794 if (not origbranch in meta.branches 795 if (not origbranch in meta.branches
795 and not meta.get_path_tag(meta.remotename(origbranch))): 796 and not meta.get_path_tag(meta.remotename(origbranch))):