Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3656
- 441956d8fce5
- parent 3591
- 2f2a4a76dd22
- child 3670
- f0cb7579c0b4
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 15 | 15 |
| 16 import os | 16 import os |
| 17 import shutil | 17 import shutil |
| 18 import re | 18 import re |
| 19 | 19 |
| 20 from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher | 20 from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, \ |
| 21 from PyQt4.QtGui import QApplication, QDialog, QInputDialog | 21 QCoreApplication |
| 22 from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog | |
| 22 | 23 |
| 23 from E5Gui.E5Application import e5App | 24 from E5Gui.E5Application import e5App |
| 24 from E5Gui import E5MessageBox, E5FileDialog | 25 from E5Gui import E5MessageBox, E5FileDialog |
| 25 | 26 |
| 26 from QScintilla.MiniEditor import MiniEditor | 27 from QScintilla.MiniEditor import MiniEditor |
| 1417 index += 1 | 1418 index += 1 |
| 1418 changeset, tags, author, date, branches, bookmarks = \ | 1419 changeset, tags, author, date, branches, bookmarks = \ |
| 1419 line.split("@@@") | 1420 line.split("@@@") |
| 1420 cdate, ctime = date.split()[:2] | 1421 cdate, ctime = date.split()[:2] |
| 1421 info = [] | 1422 info = [] |
| 1422 info.append(QApplication.translate( | 1423 info.append(QCoreApplication.translate( |
| 1423 "mercurial", | 1424 "mercurial", |
| 1424 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" | 1425 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" |
| 1425 """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""") | 1426 """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""") |
| 1426 .format(index, changeset)) | 1427 .format(index, changeset)) |
| 1427 if tags: | 1428 if tags: |
| 1428 info.append(QApplication.translate( | 1429 info.append(QCoreApplication.translate( |
| 1429 "mercurial", | 1430 "mercurial", |
| 1430 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") | 1431 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") |
| 1431 .format('<br/>'.join(tags.split()))) | 1432 .format('<br/>'.join(tags.split()))) |
| 1432 if bookmarks: | 1433 if bookmarks: |
| 1433 info.append(QApplication.translate( | 1434 info.append(QCoreApplication.translate( |
| 1434 "mercurial", | 1435 "mercurial", |
| 1435 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") | 1436 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") |
| 1436 .format('<br/>'.join(bookmarks.split()))) | 1437 .format('<br/>'.join(bookmarks.split()))) |
| 1437 if branches: | 1438 if branches: |
| 1438 info.append(QApplication.translate( | 1439 info.append(QCoreApplication.translate( |
| 1439 "mercurial", | 1440 "mercurial", |
| 1440 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") | 1441 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") |
| 1441 .format('<br/>'.join(branches.split()))) | 1442 .format('<br/>'.join(branches.split()))) |
| 1442 info.append(QApplication.translate( | 1443 info.append(QCoreApplication.translate( |
| 1443 "mercurial", | 1444 "mercurial", |
| 1444 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" | 1445 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" |
| 1445 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" | 1446 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" |
| 1446 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""") | 1447 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""") |
| 1447 .format(author, cdate, ctime)) | 1448 .format(author, cdate, ctime)) |
| 1471 if output: | 1472 if output: |
| 1472 url = output.splitlines()[0].strip() | 1473 url = output.splitlines()[0].strip() |
| 1473 else: | 1474 else: |
| 1474 url = "" | 1475 url = "" |
| 1475 | 1476 |
| 1476 return QApplication.translate( | 1477 return QCoreApplication.translate( |
| 1477 'mercurial', | 1478 'mercurial', |
| 1478 """<h3>Repository information</h3>\n""" | 1479 """<h3>Repository information</h3>\n""" |
| 1479 """<p><table>\n""" | 1480 """<p><table>\n""" |
| 1480 """<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>\n""" | 1481 """<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>\n""" |
| 1481 """<tr></tr>\n""" | 1482 """<tr></tr>\n""" |
| 2060 changeset, tags, author, date, branches, parents, bookmarks = \ | 2061 changeset, tags, author, date, branches, parents, bookmarks = \ |
| 2061 line.split("@@@") | 2062 line.split("@@@") |
| 2062 cdate, ctime = date.split()[:2] | 2063 cdate, ctime = date.split()[:2] |
| 2063 info.append("""<p><table>""") | 2064 info.append("""<p><table>""") |
| 2064 if mode == "heads": | 2065 if mode == "heads": |
| 2065 info.append(QApplication.translate( | 2066 info.append(QCoreApplication.translate( |
| 2066 "mercurial", | 2067 "mercurial", |
| 2067 """<tr><td><b>Head #{0}</b></td><td></td></tr>\n""" | 2068 """<tr><td><b>Head #{0}</b></td><td></td></tr>\n""" |
| 2068 .format(index, changeset))) | 2069 .format(index, changeset))) |
| 2069 elif mode == "parents": | 2070 elif mode == "parents": |
| 2070 info.append(QApplication.translate( | 2071 info.append(QCoreApplication.translate( |
| 2071 "mercurial", | 2072 "mercurial", |
| 2072 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" | 2073 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" |
| 2073 .format(index, changeset))) | 2074 .format(index, changeset))) |
| 2074 elif mode == "tip": | 2075 elif mode == "tip": |
| 2075 info.append(QApplication.translate( | 2076 info.append(QCoreApplication.translate( |
| 2076 "mercurial", | 2077 "mercurial", |
| 2077 """<tr><td><b>Tip</b></td><td></td></tr>\n""")) | 2078 """<tr><td><b>Tip</b></td><td></td></tr>\n""")) |
| 2078 info.append(QApplication.translate( | 2079 info.append(QCoreApplication.translate( |
| 2079 "mercurial", | 2080 "mercurial", |
| 2080 """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""") | 2081 """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""") |
| 2081 .format(changeset)) | 2082 .format(changeset)) |
| 2082 if tags: | 2083 if tags: |
| 2083 info.append(QApplication.translate( | 2084 info.append(QCoreApplication.translate( |
| 2084 "mercurial", | 2085 "mercurial", |
| 2085 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") | 2086 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") |
| 2086 .format('<br/>'.join(tags.split()))) | 2087 .format('<br/>'.join(tags.split()))) |
| 2087 if bookmarks: | 2088 if bookmarks: |
| 2088 info.append(QApplication.translate( | 2089 info.append(QCoreApplication.translate( |
| 2089 "mercurial", | 2090 "mercurial", |
| 2090 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") | 2091 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") |
| 2091 .format('<br/>'.join(bookmarks.split()))) | 2092 .format('<br/>'.join(bookmarks.split()))) |
| 2092 if branches: | 2093 if branches: |
| 2093 info.append(QApplication.translate( | 2094 info.append(QCoreApplication.translate( |
| 2094 "mercurial", | 2095 "mercurial", |
| 2095 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") | 2096 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") |
| 2096 .format('<br/>'.join(branches.split()))) | 2097 .format('<br/>'.join(branches.split()))) |
| 2097 if parents: | 2098 if parents: |
| 2098 info.append(QApplication.translate( | 2099 info.append(QCoreApplication.translate( |
| 2099 "mercurial", | 2100 "mercurial", |
| 2100 """<tr><td><b>Parents</b></td><td>{0}</td></tr>""") | 2101 """<tr><td><b>Parents</b></td><td>{0}</td></tr>""") |
| 2101 .format('<br/>'.join(parents.split()))) | 2102 .format('<br/>'.join(parents.split()))) |
| 2102 info.append(QApplication.translate( | 2103 info.append(QCoreApplication.translate( |
| 2103 "mercurial", | 2104 "mercurial", |
| 2104 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" | 2105 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" |
| 2105 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" | 2106 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" |
| 2106 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" | 2107 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" |
| 2107 """</table></p>""") | 2108 """</table></p>""") |
