Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 14994:a115b5ee9c63 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: handle adding svn subrepo with a svn:external file in it (issue2931)
author Vasily Titskiy <qehgt0@gmail.com>
date Thu, 28 Jul 2011 13:28:32 -0400
parents 95ced9f5bf29
children f6a737357195 d629f1e89021
comparison
equal deleted inserted replaced
14993:e5b2ee5157ae 14994:a115b5ee9c63
604 props = s[0].getAttribute('props') 604 props = s[0].getAttribute('props')
605 path = e.getAttribute('path') 605 path = e.getAttribute('path')
606 if item == 'external': 606 if item == 'external':
607 externals.append(path) 607 externals.append(path)
608 if (item not in ('', 'normal', 'unversioned', 'external') 608 if (item not in ('', 'normal', 'unversioned', 'external')
609 or props not in ('', 'none')): 609 or props not in ('', 'none', 'normal')):
610 changes.append(path) 610 changes.append(path)
611 for path in changes: 611 for path in changes:
612 for ext in externals: 612 for ext in externals:
613 if path == ext or path.startswith(ext + os.sep): 613 if path == ext or path.startswith(ext + os.sep):
614 return True, True 614 return True, True