Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 8222
- 5994b80b8760
- parent 8220
- 006ee31b4835
- child 8234
- fcb6b4b96274
equal
deleted
inserted
replaced
| 8221:0572a215bd2f | 8222:5994b80b8760 |
|---|---|
| 824 msgPart = "local " | 824 msgPart = "local " |
| 825 else: | 825 else: |
| 826 msgPart = "global " | 826 msgPart = "global " |
| 827 if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]: | 827 if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]: |
| 828 args.append('--remove') | 828 args.append('--remove') |
| 829 if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]: | 829 if ( |
| 830 if revision: | 830 tagOp in [ |
| 831 args.append("--rev") | 831 HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag] and |
| 832 args.append(revision) | 832 revision |
| 833 ): | |
| 834 args.append("--rev") | |
| 835 args.append(revision) | |
| 833 if force: | 836 if force: |
| 834 args.append("--force") | 837 args.append("--force") |
| 835 args.append('--message') | 838 args.append('--message') |
| 836 if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]: | 839 if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]: |
| 837 tag = tag.strip().replace(" ", "_") | 840 tag = tag.strip().replace(" ", "_") |
| 1076 for line in output.splitlines(): | 1079 for line in output.splitlines(): |
| 1077 if line and line[0] in "MARC!?I": | 1080 if line and line[0] in "MARC!?I": |
| 1078 flag, path = line.split(" ", 1) | 1081 flag, path = line.split(" ", 1) |
| 1079 name = os.path.normcase(os.path.join(repoPath, path)) | 1082 name = os.path.normcase(os.path.join(repoPath, path)) |
| 1080 dirName = os.path.dirname(name) | 1083 dirName = os.path.dirname(name) |
| 1081 if name.startswith(dname): | 1084 if name.startswith(dname) and flag not in "?I": |
| 1082 if flag not in "?I": | 1085 if name in names: |
| 1083 if name in names: | 1086 names[name] = self.canBeCommitted |
| 1084 names[name] = self.canBeCommitted | 1087 if dirName in names: |
| 1085 if dirName in names: | 1088 names[dirName] = self.canBeCommitted |
| 1086 names[dirName] = self.canBeCommitted | 1089 if dirs: |
| 1087 if dirs: | 1090 for d in dirs: |
| 1088 for d in dirs: | 1091 if name.startswith(d): |
| 1089 if name.startswith(d): | 1092 names[d] = self.canBeCommitted |
| 1090 names[d] = self.canBeCommitted | 1093 dirs.remove(d) |
| 1091 dirs.remove(d) | 1094 break |
| 1092 break | |
| 1093 if flag not in "?I": | 1095 if flag not in "?I": |
| 1094 self.statusCache[name] = self.canBeCommitted | 1096 self.statusCache[name] = self.canBeCommitted |
| 1095 self.statusCache[dirName] = self.canBeCommitted | 1097 self.statusCache[dirName] = self.canBeCommitted |
| 1096 else: | 1098 else: |
| 1097 self.statusCache[name] = self.canBeAdded | 1099 self.statusCache[name] = self.canBeAdded |
