Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 10373
- 093dcebe5ecb
- parent 10372
- 1444b4bee64b
- child 10403
- ea3320d5e8e9
equal
deleted
inserted
replaced
| 10372:1444b4bee64b | 10373:093dcebe5ecb |
|---|---|
| 1005 names = [project.getRelativePath(nam) for nam in names] | 1005 names = [project.getRelativePath(nam) for nam in names] |
| 1006 if names[0]: | 1006 if names[0]: |
| 1007 dlg = DeleteFilesConfirmationDialog( | 1007 dlg = DeleteFilesConfirmationDialog( |
| 1008 self.parent(), | 1008 self.parent(), |
| 1009 self.tr("Re-Merge"), | 1009 self.tr("Re-Merge"), |
| 1010 self.tr( | 1010 self.tr("Do you really want to re-merge these files or directories?"), |
| 1011 "Do you really want to re-merge these files or directories?" | |
| 1012 ), | |
| 1013 names, | 1011 names, |
| 1014 ) | 1012 ) |
| 1015 yes = dlg.exec() == QDialog.DialogCode.Accepted | 1013 yes = dlg.exec() == QDialog.DialogCode.Accepted |
| 1016 else: | 1014 else: |
| 1017 yes = EricMessageBox.yesNo( | 1015 yes = EricMessageBox.yesNo( |
| 1104 if dname.endswith(os.sep): | 1102 if dname.endswith(os.sep): |
| 1105 dname = dname[:-1] | 1103 dname = dname[:-1] |
| 1106 dname = os.path.normcase(dname) | 1104 dname = os.path.normcase(dname) |
| 1107 | 1105 |
| 1108 found = False | 1106 found = False |
| 1109 for name in list(self.statusCache.keys()): | 1107 for name in self.statusCache: |
| 1110 if name in names: | 1108 if name in names: |
| 1111 found = True | 1109 found = True |
| 1112 names[name] = self.statusCache[name] | 1110 names[name] = self.statusCache[name] |
| 1113 | 1111 |
| 1114 if not found: | 1112 if not found: |
| 1118 | 1116 |
| 1119 output, error = self.__client.runcommand(args) | 1117 output, error = self.__client.runcommand(args) |
| 1120 | 1118 |
| 1121 if output: | 1119 if output: |
| 1122 repoPath = self.getClient().getRepository() | 1120 repoPath = self.getClient().getRepository() |
| 1123 dirs = [x for x in names.keys() if os.path.isdir(x)] | 1121 dirs = [x for x in names if os.path.isdir(x)] |
| 1124 for line in output.splitlines(): | 1122 for line in output.splitlines(): |
| 1125 if line and line[0] in "MARC!?I": | 1123 if line and line[0] in "MARC!?I": |
| 1126 flag, path = line.split(" ", 1) | 1124 flag, path = line.split(" ", 1) |
| 1127 name = os.path.normcase(os.path.join(repoPath, path)) | 1125 name = os.path.normcase(os.path.join(repoPath, path)) |
| 1128 dirName = os.path.dirname(name) | 1126 dirName = os.path.dirname(name) |
