Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2847
- 1843ef6e2656
- parent 3009
- bf5ae5d7477d
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 192 self.uptodate = { | 192 self.uptodate = { |
| 193 ' ': self.trUtf8('yes'), | 193 ' ': self.trUtf8('yes'), |
| 194 '*': self.trUtf8('no'), | 194 '*': self.trUtf8('no'), |
| 195 } | 195 } |
| 196 | 196 |
| 197 self.rx_status = \ | 197 self.rx_status = QRegExp( |
| 198 QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') | 198 '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*') |
| 199 # flags (8 or 9 anything), revision, changed rev, author, path | 199 # flags (8 or 9 anything), revision, changed rev, author, path |
| 200 self.rx_status2 = \ | 200 self.rx_status2 = \ |
| 201 QRegExp('(.{8,9})\\s+(.+)\\s*') | 201 QRegExp('(.{8,9})\\s+(.+)\\s*') |
| 202 # flags (8 or 9 anything), path | 202 # flags (8 or 9 anything), path |
| 203 self.rx_changelist = \ | 203 self.rx_changelist = \ |
| 417 self.process.waitForFinished(3000) | 417 self.process.waitForFinished(3000) |
| 418 | 418 |
| 419 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) | 419 self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
| 420 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) | 420 self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
| 421 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) | 421 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
| 422 self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason) | 422 self.buttonBox.button(QDialogButtonBox.Close).setFocus( |
| 423 Qt.OtherFocusReason) | |
| 423 | 424 |
| 424 self.inputGroup.setEnabled(False) | 425 self.inputGroup.setEnabled(False) |
| 425 self.inputGroup.hide() | 426 self.inputGroup.hide() |
| 426 self.refreshButton.setEnabled(True) | 427 self.refreshButton.setEnabled(True) |
| 427 | 428 |
| 999 | 1000 |
| 1000 def __getLockActionItems(self, indicators): | 1001 def __getLockActionItems(self, indicators): |
| 1001 """ | 1002 """ |
| 1002 Private method to retrieve all emtries, that have a locked status. | 1003 Private method to retrieve all emtries, that have a locked status. |
| 1003 | 1004 |
| 1005 @param indicators list of indicators to check against (list of strings) | |
| 1004 @return list of all items with a locked status | 1006 @return list of all items with a locked status |
| 1005 """ | 1007 """ |
| 1006 lockitems = [] | 1008 lockitems = [] |
| 1007 for itm in self.statusList.selectedItems(): | 1009 for itm in self.statusList.selectedItems(): |
| 1008 if itm.text(self.__lockinfoColumn) in indicators: | 1010 if itm.text(self.__lockinfoColumn) in indicators: |
