Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- changeset 8237
- acc1490f822e
- parent 8222
- 5994b80b8760
- child 8273
- 698ae46f40a4
equal
deleted
inserted
replaced
| 8236:695777f04b25 | 8237:acc1490f822e |
|---|---|
| 86 elif version.startswith("{"): | 86 elif version.startswith("{"): |
| 87 dateStr = version[1:-1] | 87 dateStr = version[1:-1] |
| 88 secs = QDateTime.fromString( | 88 secs = QDateTime.fromString( |
| 89 dateStr, Qt.DateFormat.ISODate).toTime_t() | 89 dateStr, Qt.DateFormat.ISODate).toTime_t() |
| 90 return pysvn.Revision(pysvn.opt_revision_kind.date, secs) | 90 return pysvn.Revision(pysvn.opt_revision_kind.date, secs) |
| 91 elif version == "HEAD": | 91 else: |
| 92 return pysvn.Revision(pysvn.opt_revision_kind.head) | 92 return { |
| 93 elif version == "COMMITTED": | 93 "HEAD": pysvn.Revision(pysvn.opt_revision_kind.head), |
| 94 return pysvn.Revision(pysvn.opt_revision_kind.committed) | 94 "COMMITTED": pysvn.Revision(pysvn.opt_revision_kind.committed), |
| 95 elif version == "BASE": | 95 "BASE": pysvn.Revision(pysvn.opt_revision_kind.base), |
| 96 return pysvn.Revision(pysvn.opt_revision_kind.base) | 96 "WORKING": pysvn.Revision(pysvn.opt_revision_kind.working), |
| 97 elif version == "WORKING": | 97 "PREV": pysvn.Revision(pysvn.opt_revision_kind.previous), |
| 98 return pysvn.Revision(pysvn.opt_revision_kind.working) | 98 }.get(version, pysvn.Revision(pysvn.opt_revision_kind.unspecified)) |
| 99 elif version == "PREV": | 99 |
| 100 return pysvn.Revision(pysvn.opt_revision_kind.previous) | |
| 101 else: | |
| 102 return pysvn.Revision(pysvn.opt_revision_kind.unspecified) | |
| 103 | |
| 104 def __getDiffSummaryKind(self, summaryKind): | 100 def __getDiffSummaryKind(self, summaryKind): |
| 105 """ | 101 """ |
| 106 Private method to get a string descripion of the diff summary. | 102 Private method to get a string descripion of the diff summary. |
| 107 | 103 |
| 108 @param summaryKind (pysvn.diff_summarize.summarize_kind) | 104 @param summaryKind (pysvn.diff_summarize.summarize_kind) |
