comparison hgsubversion/replay.py @ 1527:d03995e69785

meta: force user and message to be bytes
author Augie Fackler <raf@durin42.com>
date Thu, 31 Aug 2017 01:18:19 -0400
parents 5adfb81c4680
children 8410a978c650
comparison
equal deleted inserted replaced
1526:5adfb81c4680 1527:d03995e69785
183 meta.mapbranch(extra) 183 meta.mapbranch(extra)
184 if 'branch' not in extra: 184 if 'branch' not in extra:
185 extra['branch'] = 'default' 185 extra['branch'] = 'default'
186 current_ctx = context.memctx(meta.repo, 186 current_ctx = context.memctx(meta.repo,
187 parents, 187 parents,
188 meta.getmessage(rev), 188 util.forceutf8(meta.getmessage(rev)),
189 [util.forceutf8(f) for f in files.keys()], 189 [util.forceutf8(f) for f in files.keys()],
190 filectxfn, 190 filectxfn,
191 meta.authors[rev.author], 191 util.forceutf8(meta.authors[rev.author]),
192 date, 192 date,
193 extra) 193 extra)
194 194
195 new_hash = meta.repo.svn_commitctx(current_ctx) 195 new_hash = meta.repo.svn_commitctx(current_ctx)
196 util.describe_commit(ui, new_hash, branch) 196 util.describe_commit(ui, new_hash, branch)
223 extra = meta.genextra(rev.revnum, branch) 223 extra = meta.genextra(rev.revnum, branch)
224 meta.mapbranch(extra) 224 meta.mapbranch(extra)
225 225
226 current_ctx = context.memctx(meta.repo, 226 current_ctx = context.memctx(meta.repo,
227 (ha, node.nullid), 227 (ha, node.nullid),
228 meta.getmessage(rev), 228 util.forceutf8(meta.getmessage(rev)),
229 [util.forceutf8(f) for f in files], 229 [util.forceutf8(f) for f in files],
230 del_all_files, 230 del_all_files,
231 meta.authors[rev.author], 231 util.forceutf8(meta.authors[rev.author]),
232 date, 232 date,
233 extra) 233 extra)
234 new_hash = meta.repo.svn_commitctx(current_ctx) 234 new_hash = meta.repo.svn_commitctx(current_ctx)
235 util.describe_commit(ui, new_hash, branch) 235 util.describe_commit(ui, new_hash, branch)
236 if (rev.revnum, branch) not in meta.revmap: 236 if (rev.revnum, branch) not in meta.revmap: