Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 205
- e5f10cf7fdc9
- parent 202
- 6854bb0beda5
- child 207
- 3f889378dede
equal
deleted
inserted
replaced
| 204:61552f56788a | 205:e5f10cf7fdc9 |
|---|---|
| 836 @return the received dictionary completed with a combination of | 836 @return the received dictionary completed with a combination of |
| 837 canBeCommited and canBeAdded or None in order to signal an error | 837 canBeCommited and canBeAdded or None in order to signal an error |
| 838 """ | 838 """ |
| 839 if dname.endswith(os.sep): | 839 if dname.endswith(os.sep): |
| 840 dname = dname[:-1] | 840 dname = dname[:-1] |
| 841 dname = os.path.normcase(dname) | |
| 841 | 842 |
| 842 found = False | 843 found = False |
| 843 for name in list(self.statusCache.keys()): | 844 for name in list(self.statusCache.keys()): |
| 844 if name in names: | 845 if name in names: |
| 845 found = True | 846 found = True |
| 868 dirs = [x for x in names.keys() if os.path.isdir(x)] | 869 dirs = [x for x in names.keys() if os.path.isdir(x)] |
| 869 output = \ | 870 output = \ |
| 870 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 871 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 871 for line in output.splitlines(): | 872 for line in output.splitlines(): |
| 872 flag, path = line.split(" ", 1) | 873 flag, path = line.split(" ", 1) |
| 873 name = os.path.join(repodir, os.path.normcase(path)) | 874 name = os.path.normcase(os.path.join(repodir, path)) |
| 874 dirName = os.path.dirname(name) | 875 dirName = os.path.dirname(name) |
| 875 if name.startswith(dname): | 876 if name.startswith(dname): |
| 876 if flag not in "?I": | 877 if flag not in "?I": |
| 877 if name in names: | 878 if name in names: |
| 878 names[name] = self.canBeCommitted | 879 names[name] = self.canBeCommitted |
