Mercurial > hg
comparison hgext/convert/subversion.py @ 12770:614f0d8724ab
check-code: find trailing whitespace
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 20 Oct 2010 10:13:04 +0200 |
parents | 28642f7fc2cf |
children | 5fb924ee44d5 |
comparison
equal
deleted
inserted
replaced
12769:daa8dc6e1f66 | 12770:614f0d8724ab |
---|---|
649 if childpath: | 649 if childpath: |
650 removed.add(self.recode(childpath)) | 650 removed.add(self.recode(childpath)) |
651 else: | 651 else: |
652 self.ui.debug('unknown path in revision %d: %s\n' % \ | 652 self.ui.debug('unknown path in revision %d: %s\n' % \ |
653 (revnum, path)) | 653 (revnum, path)) |
654 elif kind == svn.core.svn_node_dir: | 654 elif kind == svn.core.svn_node_dir: |
655 if ent.action == 'M': | 655 if ent.action == 'M': |
656 # If the directory just had a prop change, | 656 # If the directory just had a prop change, |
657 # then we shouldn't need to look for its children. | 657 # then we shouldn't need to look for its children. |
658 continue | 658 continue |
659 elif ent.action == 'R' and parents: | 659 elif ent.action == 'R' and parents: |
821 raise | 821 raise |
822 | 822 |
823 def getfile(self, file, rev): | 823 def getfile(self, file, rev): |
824 # TODO: ra.get_file transmits the whole file instead of diffs. | 824 # TODO: ra.get_file transmits the whole file instead of diffs. |
825 if file in self.removed: | 825 if file in self.removed: |
826 raise IOError() | 826 raise IOError() |
827 mode = '' | 827 mode = '' |
828 try: | 828 try: |
829 new_module, revnum = self.revsplit(rev)[1:] | 829 new_module, revnum = self.revsplit(rev)[1:] |
830 if self.module != new_module: | 830 if self.module != new_module: |
831 self.module = new_module | 831 self.module = new_module |
890 # to PROPFIND subversion errors | 890 # to PROPFIND subversion errors |
891 return svn.ra.check_path(self.ra, path.strip('/'), revnum) | 891 return svn.ra.check_path(self.ra, path.strip('/'), revnum) |
892 finally: | 892 finally: |
893 if module is not None: | 893 if module is not None: |
894 self.reparent(prevmodule) | 894 self.reparent(prevmodule) |
895 | 895 |
896 def _getlog(self, paths, start, end, limit=0, discover_changed_paths=True, | 896 def _getlog(self, paths, start, end, limit=0, discover_changed_paths=True, |
897 strict_node_history=False): | 897 strict_node_history=False): |
898 # Normalize path names, svn >= 1.5 only wants paths relative to | 898 # Normalize path names, svn >= 1.5 only wants paths relative to |
899 # supplied URL | 899 # supplied URL |
900 relpaths = [] | 900 relpaths = [] |