Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8358
- 144a6b854f70
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 264 itm.data(0, self.FilenameRole) | 264 itm.data(0, self.FilenameRole) |
| 265 for itm in self.conflictsList.selectedItems() | 265 for itm in self.conflictsList.selectedItems() |
| 266 if itm.data(0, self.StatusRole) == "U" | 266 if itm.data(0, self.StatusRole) == "U" |
| 267 ] | 267 ] |
| 268 if names: | 268 if names: |
| 269 self.vcs.hgResolved(names) | 269 self.vcs.vcsResolved(names) |
| 270 self.on_refreshButton_clicked() | 270 self.on_refreshButton_clicked() |
| 271 | 271 |
| 272 @pyqtSlot() | 272 @pyqtSlot() |
| 273 def on_unresolvedButton_clicked(self): | 273 def on_unresolvedButton_clicked(self): |
| 274 """ | 274 """ |
| 278 itm.data(0, self.FilenameRole) | 278 itm.data(0, self.FilenameRole) |
| 279 for itm in self.conflictsList.selectedItems() | 279 for itm in self.conflictsList.selectedItems() |
| 280 if itm.data(0, self.StatusRole) == "R" | 280 if itm.data(0, self.StatusRole) == "R" |
| 281 ] | 281 ] |
| 282 if names: | 282 if names: |
| 283 self.vcs.hgResolved(names, unresolve=True) | 283 self.vcs.vcsResolved(names, unresolve=True) |
| 284 self.on_refreshButton_clicked() | 284 self.on_refreshButton_clicked() |
| 285 | 285 |
| 286 @pyqtSlot() | 286 @pyqtSlot() |
| 287 def on_reMergeButton_clicked(self): | 287 def on_reMergeButton_clicked(self): |
| 288 """ | 288 """ |
