Mercurial > hgsubversion

comparison hgsubversion/hg_delta_editor.py @ 350:b6f9e270f103

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg_delta_editor: do not raise an error for bad symlinks, but warn instead.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 22 May 2009 17:47:09 +0200
parents 537de0300510
children cc7a10efddc9
comparison
equal deleted inserted replaced
349:5d0d9424913f 350:b6f9e270f103
697 if current_file in self.current_files: 697 if current_file in self.current_files:
698 data = self.current_files[current_file] 698 data = self.current_files[current_file]
699 if is_link and data.startswith('link '): 699 if is_link and data.startswith('link '):
700 data = data[len('link '):] 700 data = data[len('link '):]
701 elif is_link: 701 elif is_link:
702 raise ValueError('file erronously marked as a link: ' 702 self.ui.warn('file marked as link, but contains data: '
703 '%s (%r)' % (current_file, flags)) 703 '%s (%r)\n' % (current_file, flags))
704 else: 704 else:
705 data = parent_ctx.filectx(path).data() 705 data = parent_ctx.filectx(path).data()
706 return context.memfilectx(path=path, 706 return context.memfilectx(path=path,
707 data=data, 707 data=data,
708 islink=is_link, isexec=is_exec, 708 islink=is_link, isexec=is_exec,