Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/subrepo.py @ 30620:bb77654dc7ae
py3: replace os.sep with pycompat.ossep (part 3 of 4)
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 17 Dec 2016 20:14:24 +0530 |
parents | a145161debed |
children | a150173da1c1 |
comparison
equal
deleted
inserted
replaced
30619:cfe66dcf45c0 | 30620:bb77654dc7ae |
---|---|
29 filemerge, | 29 filemerge, |
30 match as matchmod, | 30 match as matchmod, |
31 node, | 31 node, |
32 pathutil, | 32 pathutil, |
33 phases, | 33 phases, |
34 pycompat, | |
34 scmutil, | 35 scmutil, |
35 util, | 36 util, |
36 ) | 37 ) |
37 | 38 |
38 hg = None | 39 hg = None |
1170 if (item not in ('', 'normal', 'unversioned', 'external') | 1171 if (item not in ('', 'normal', 'unversioned', 'external') |
1171 or props not in ('', 'none', 'normal')): | 1172 or props not in ('', 'none', 'normal')): |
1172 changes.append(path) | 1173 changes.append(path) |
1173 for path in changes: | 1174 for path in changes: |
1174 for ext in externals: | 1175 for ext in externals: |
1175 if path == ext or path.startswith(ext + os.sep): | 1176 if path == ext or path.startswith(ext + pycompat.ossep): |
1176 return True, True, bool(missing) | 1177 return True, True, bool(missing) |
1177 return bool(changes), False, bool(missing) | 1178 return bool(changes), False, bool(missing) |
1178 | 1179 |
1179 def dirty(self, ignoreupdate=False): | 1180 def dirty(self, ignoreupdate=False): |
1180 if not self._wcchanged()[0]: | 1181 if not self._wcchanged()[0]: |