Mercurial > hgsubversion
changeset 850:d3bc067c0f72
Cope with non standard schemes in externals
| author | Will Wykeham <will@wykeham.net> |
|---|---|
| date | Tue, 16 Aug 2011 12:39:42 +0100 |
| parents | 4e43e30e3e7d |
| children | 9ce00cb1d676 |
| files | hgsubversion/svnexternals.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgsubversion/svnexternals.py +++ b/hgsubversion/svnexternals.py @@ -96,9 +96,9 @@ def diff(ext1, ext2): class BadDefinition(Exception): pass -re_defold = re.compile(r'^\s*(.*?)\s+(?:-r\s*(\d+|\{REV\})\s+)?([a-zA-Z]+://.*)\s*$') -re_defnew = re.compile(r'^\s*(?:-r\s*(\d+|\{REV\})\s+)?((?:[a-zA-Z]+://|\^/).*)\s+(\S+)\s*$') -re_scheme = re.compile(r'^[a-zA-Z]+://') +re_defold = re.compile(r'^\s*(.*?)\s+(?:-r\s*(\d+|\{REV\})\s+)?([a-zA-Z+]+://.*)\s*$') +re_defnew = re.compile(r'^\s*(?:-r\s*(\d+|\{REV\})\s+)?((?:[a-zA-Z+]+://|\^/).*)\s+(\S+)\s*$') +re_scheme = re.compile(r'^[a-zA-Z+]+://') def parsedefinition(line): """Parse an external definition line, return a tuple (path, rev, source)