Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py
- changeset 8259
- 2bbec88047dd
- parent 8234
- fcb6b4b96274
- child 8273
- 698ae46f40a4
equal
deleted
inserted
replaced
| 8258:82b608e352ec | 8259:2bbec88047dd |
|---|---|
| 215 itm.setData(3, Qt.ItemDataRole.DisplayRole, | 215 itm.setData(3, Qt.ItemDataRole.DisplayRole, |
| 216 " ".join(message.splitlines())) | 216 " ".join(message.splitlines())) |
| 217 | 217 |
| 218 changes = [] | 218 changes = [] |
| 219 for changedPath in changedPaths: | 219 for changedPath in changedPaths: |
| 220 if changedPath["copyfrom_path"] is None: | 220 copyPath = ( |
| 221 copyPath = "" | 221 "" |
| 222 else: | 222 if changedPath["copyfrom_path"] is None else |
| 223 copyPath = changedPath["copyfrom_path"] | 223 changedPath["copyfrom_path"] |
| 224 if changedPath["copyfrom_revision"] is None: | 224 ) |
| 225 copyRev = "" | 225 copyRev = ( |
| 226 else: | 226 "" |
| 227 copyRev = "{0:7d}".format( | 227 if changedPath["copyfrom_revision"] is None else |
| 228 changedPath["copyfrom_revision"].number) | 228 "{0:7d}".format(changedPath["copyfrom_revision"].number) |
| 229 ) | |
| 229 change = { | 230 change = { |
| 230 "action": changedPath["action"], | 231 "action": changedPath["action"], |
| 231 "path": changedPath["path"], | 232 "path": changedPath["path"], |
| 232 "copyfrom_path": copyPath, | 233 "copyfrom_path": copyPath, |
| 233 "copyfrom_revision": copyRev, | 234 "copyfrom_revision": copyRev, |
| 290 fetched = 0 | 291 fetched = 0 |
| 291 logs = [] | 292 logs = [] |
| 292 with E5MutexLocker(self.vcs.vcsExecutionMutex): | 293 with E5MutexLocker(self.vcs.vcsExecutionMutex): |
| 293 while fetched < limit: | 294 while fetched < limit: |
| 294 flimit = min(fetchLimit, limit - fetched) | 295 flimit = min(fetchLimit, limit - fetched) |
| 295 if fetched == 0: | 296 revstart = ( |
| 296 revstart = start | 297 start |
| 297 else: | 298 if fetched == 0 else |
| 298 revstart = pysvn.Revision( | 299 pysvn.Revision(pysvn.opt_revision_kind.number, |
| 299 pysvn.opt_revision_kind.number, nextRev) | 300 nextRev) |
| 301 ) | |
| 300 allLogs = self.client.log( | 302 allLogs = self.client.log( |
| 301 self.fname, revision_start=revstart, | 303 self.fname, revision_start=revstart, |
| 302 discover_changed_paths=True, limit=flimit + 1, | 304 discover_changed_paths=True, limit=flimit + 1, |
| 303 strict_node_history=self.stopCheckBox.isChecked()) | 305 strict_node_history=self.stopCheckBox.isChecked()) |
| 304 if ( | 306 if ( |
