Mercurial > hgsubversion

comparison hgsubversion/svnmeta.py @ 1527:d03995e69785

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
meta: force user and message to be bytes
author Augie Fackler <raf@durin42.com>
date Thu, 31 Aug 2017 01:18:19 -0400
parents 180e0d5fba2e
children 4e28e01f57da
comparison
equal deleted inserted replaced
1526:5adfb81c4680 1527:d03995e69785
456 if path and path[0] == '/': 456 if path and path[0] == '/':
457 path = path[1:] 457 path = path[1:]
458 return path 458 return path
459 459
460 def getmessage(self, rev): 460 def getmessage(self, rev):
461 msg = rev.message 461 msg = util.forceutf8(rev.message)
462 462
463 if msg: 463 if msg:
464 try: 464 try:
465 msg.decode('utf-8') 465 msg.decode('utf-8')
466 return msg 466 return msg
814 ctx = context.memctx(self.repo, 814 ctx = context.memctx(self.repo,
815 (parentctx.node(), node.nullid), 815 (parentctx.node(), node.nullid),
816 self.getmessage(rev), 816 self.getmessage(rev),
817 ['.hgtags', ], 817 ['.hgtags', ],
818 hgtagsfn, 818 hgtagsfn,
819 self.authors[rev.author], 819 util.forceutf8(self.authors[rev.author]),
820 date, 820 date,
821 parentctx.extra()) 821 parentctx.extra())
822 new_hash = self.repo.svn_commitctx(ctx) 822 new_hash = self.repo.svn_commitctx(ctx)
823 if not newparent: 823 if not newparent:
824 assert self.revmap[revnum, branch] == parentctx.node() 824 assert self.revmap[revnum, branch] == parentctx.node()
882 ctx = context.memctx(self.repo, 882 ctx = context.memctx(self.repo,
883 (parent.node(), node.nullid), 883 (parent.node(), node.nullid),
884 self.getmessage(rev), 884 self.getmessage(rev),
885 ['.hgtags'], 885 ['.hgtags'],
886 fctxfun, 886 fctxfun,
887 self.authors[rev.author], 887 util.forceutf8(self.authors[rev.author]),
888 date, 888 date,
889 extra) 889 extra)
890 new = self.repo.svn_commitctx(ctx) 890 new = self.repo.svn_commitctx(ctx)
891 891
892 if not fromtag and (rev.revnum, b) not in self.revmap: 892 if not fromtag and (rev.revnum, b) not in self.revmap:
904 ctx = context.memctx(self.repo, 904 ctx = context.memctx(self.repo,
905 (node, revlog.nullid), 905 (node, revlog.nullid),
906 self.getmessage(rev), 906 self.getmessage(rev),
907 [], 907 [],
908 lambda x, y, z: None, 908 lambda x, y, z: None,
909 self.authors[rev.author], 909 util.forceutf8(self.authors[rev.author]),
910 self.fixdate(rev.date), 910 self.fixdate(rev.date),
911 extra) 911 extra)
912 new = self.repo.svn_commitctx(ctx) 912 new = self.repo.svn_commitctx(ctx)
913 self.ui.status('Marked branch %s as closed.\n' % (branch or 'default')) 913 self.ui.status('Marked branch %s as closed.\n' % (branch or 'default'))