hgext/convert/subversion.py
branchstable
changeset 44970 7a4630536e53
parent 44969 d545b895234a
child 44971 423e20c78e6d
equal deleted inserted replaced
44969:d545b895234a 44970:7a4630536e53
   533                     raise error.Abort(
   533                     raise error.Abort(
   534                         _(b'expected %s to be at %r, but not found')
   534                         _(b'expected %s to be at %r, but not found')
   535                         % (name, path)
   535                         % (name, path)
   536                     )
   536                     )
   537                 return None
   537                 return None
   538             self.ui.note(_(b'found %s at %r\n') % (name, path))
   538             self.ui.note(
       
   539                 _(b'found %s at %r\n') % (name, pycompat.bytestr(path))
       
   540             )
   539             return path
   541             return path
   540 
   542 
   541         rev = optrev(self.last_changed)
   543         rev = optrev(self.last_changed)
   542         oldmodule = b''
   544         oldmodule = b''
   543         trunk = getcfgpath(b'trunk', rev)
   545         trunk = getcfgpath(b'trunk', rev)
  1206                 return relative[1:]
  1208                 return relative[1:]
  1207             elif relative == b'':
  1209             elif relative == b'':
  1208                 return relative
  1210                 return relative
  1209 
  1211 
  1210         # The path is outside our tracked tree...
  1212         # The path is outside our tracked tree...
  1211         self.ui.debug(b'%r is not under %r, ignoring\n' % (path, module))
  1213         self.ui.debug(
       
  1214             b'%r is not under %r, ignoring\n'
       
  1215             % (pycompat.bytestr(path), pycompat.bytestr(module))
       
  1216         )
  1212         return None
  1217         return None
  1213 
  1218 
  1214     def _checkpath(self, path, revnum, module=None):
  1219     def _checkpath(self, path, revnum, module=None):
  1215         if module is not None:
  1220         if module is not None:
  1216             prevmodule = self.reparent(b'')
  1221             prevmodule = self.reparent(b'')