hgext/convert/convcmd.py
changeset 6054 e2cbdd931341
parent 6035 df659eb23360
child 6130 516d8ffede7c
equal deleted inserted replaced
6053:4e87e785c5bf 6054:e2cbdd931341
   239         self.map[rev] = newnode
   239         self.map[rev] = newnode
   240 
   240 
   241     def convert(self):
   241     def convert(self):
   242 
   242 
   243         def recode(s):
   243         def recode(s):
   244             return s.decode('utf-8').encode(orig_encoding, 'replace')
   244             if isinstance(s, unicode):
       
   245                 return s.encode(orig_encoding, 'replace')
       
   246             else:
       
   247                 return s.decode('utf-8').encode(orig_encoding, 'replace')
   245 
   248 
   246         try:
   249         try:
   247             self.source.before()
   250             self.source.before()
   248             self.dest.before()
   251             self.dest.before()
   249             self.source.setrevmap(self.map)
   252             self.source.setrevmap(self.map)