##// END OF EJS Templates
convert: be even more tolerant when detecting svn tags...
Patrick Mezard -
r7381:b965605d default
parent child Browse files
Show More
@@ -46,6 +46,9 b' try:'
46 except ImportError:
46 except ImportError:
47 pass
47 pass
48
48
49 class SvnPathNotFound(Exception):
50 pass
51
49 def geturl(path):
52 def geturl(path):
50 try:
53 try:
51 return svn.client.url_from_path(svn.core.svn_path_canonicalize(path))
54 return svn.client.url_from_path(svn.core.svn_path_canonicalize(path))
@@ -414,9 +417,15 b' class svn_source(converter_source):'
414 remainings.append([source, sourcerev, tagname])
417 remainings.append([source, sourcerev, tagname])
415 continue
418 continue
416 # From revision may be fake, get one with changes
419 # From revision may be fake, get one with changes
417 tagid = self.latest(source, sourcerev)
420 try:
418 if tagid:
421 tagid = self.latest(source, sourcerev)
419 tags[tagname] = tagid
422 if tagid:
423 tags[tagname] = tagid
424 except SvnPathNotFound:
425 # It happens when we are following directories we assumed
426 # were copied with their parents but were really created
427 # in the tag directory.
428 pass
420 pendings = remainings
429 pendings = remainings
421 tagspath = srctagspath
430 tagspath = srctagspath
422
431
@@ -474,7 +483,7 b' class svn_source(converter_source):'
474 except SubversionException:
483 except SubversionException:
475 dirent = None
484 dirent = None
476 if not dirent:
485 if not dirent:
477 raise util.Abort('%s not found up to revision %d' % (path, stop))
486 raise SvnPathNotFound(_('%s not found up to revision %d') % (path, stop))
478
487
479 # stat() gives us the previous revision on this line of development, but
488 # stat() gives us the previous revision on this line of development, but
480 # it might be in *another module*. Fetch the log and detect renames down
489 # it might be in *another module*. Fetch the log and detect renames down
@@ -836,7 +845,7 b' class svn_source(converter_source):'
836 latest = self.latest(self.module, firstrevnum - 1)
845 latest = self.latest(self.module, firstrevnum - 1)
837 if latest:
846 if latest:
838 firstcset.parents.append(latest)
847 firstcset.parents.append(latest)
839 except util.Abort:
848 except SvnPathNotFound:
840 pass
849 pass
841 except SubversionException, (inst, num):
850 except SubversionException, (inst, num):
842 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
851 if num == svn.core.SVN_ERR_FS_NO_SUCH_REVISION:
General Comments 0
You need to be logged in to leave comments. Login now