hgext/convert/convcmd.py
changeset 5954 851402e53337
parent 5794 4c16020d1172
child 5959 0162c6cc045e
equal deleted inserted replaced
5953:e7f1be4bf40a 5954:851402e53337
   228         newnode = self.dest.putcommit(filenames, parents, commit)
   228         newnode = self.dest.putcommit(filenames, parents, commit)
   229         self.source.converted(rev, newnode)
   229         self.source.converted(rev, newnode)
   230         self.map[rev] = newnode
   230         self.map[rev] = newnode
   231 
   231 
   232     def convert(self):
   232     def convert(self):
       
   233 
       
   234         def recode(s):
       
   235             return s.decode('utf-8').encode(orig_encoding, 'replace')
       
   236 
   233         try:
   237         try:
   234             self.source.before()
   238             self.source.before()
   235             self.dest.before()
   239             self.dest.before()
   236             self.source.setrevmap(self.map)
   240             self.source.setrevmap(self.map)
   237             self.ui.status("scanning source...\n")
   241             self.ui.status("scanning source...\n")
   249                 if "\n" in desc:
   253                 if "\n" in desc:
   250                     desc = desc.splitlines()[0]
   254                     desc = desc.splitlines()[0]
   251                 # convert log message to local encoding without using
   255                 # convert log message to local encoding without using
   252                 # tolocal() because util._encoding conver() use it as
   256                 # tolocal() because util._encoding conver() use it as
   253                 # 'utf-8'
   257                 # 'utf-8'
   254                 desc = desc.decode('utf-8').encode(orig_encoding, 'replace')
   258                 self.ui.status("%d %s\n" % (num, recode(desc)))
   255                 self.ui.status("%d %s\n" % (num, desc))
   259                 self.ui.note(_("source: %s\n" % recode(c)))
   256                 self.copy(c)
   260                 self.copy(c)
   257 
   261 
   258             tags = self.source.gettags()
   262             tags = self.source.gettags()
   259             ctags = {}
   263             ctags = {}
   260             for k in tags:
   264             for k in tags: