Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3034
- 7ce719013078
- parent 3023
- 34ce20603bf7
- child 3036
- 30c81c9e88b8
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 1354 cdate, ctime = date.split()[:2] | 1354 cdate, ctime = date.split()[:2] |
| 1355 info = [] | 1355 info = [] |
| 1356 info.append(QApplication.translate( | 1356 info.append(QApplication.translate( |
| 1357 "mercurial", | 1357 "mercurial", |
| 1358 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" | 1358 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" |
| 1359 """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\ | 1359 """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""") |
| 1360 .format(index, changeset)) | 1360 .format(index, changeset)) |
| 1361 if tags: | 1361 if tags: |
| 1362 info.append(QApplication.translate( | 1362 info.append(QApplication.translate( |
| 1363 "mercurial", | 1363 "mercurial", |
| 1364 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ | 1364 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") |
| 1365 .format('<br/>'.join(tags.split()))) | 1365 .format('<br/>'.join(tags.split()))) |
| 1366 if bookmarks: | 1366 if bookmarks: |
| 1367 info.append(QApplication.translate( | 1367 info.append(QApplication.translate( |
| 1368 "mercurial", | 1368 "mercurial", |
| 1369 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\ | 1369 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") |
| 1370 .format('<br/>'.join(bookmarks.split()))) | 1370 .format('<br/>'.join(bookmarks.split()))) |
| 1371 if branches: | 1371 if branches: |
| 1372 info.append(QApplication.translate( | 1372 info.append(QApplication.translate( |
| 1373 "mercurial", | 1373 "mercurial", |
| 1374 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ | 1374 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") |
| 1375 .format('<br/>'.join(branches.split()))) | 1375 .format('<br/>'.join(branches.split()))) |
| 1376 info.append(QApplication.translate( | 1376 info.append(QApplication.translate( |
| 1377 "mercurial", | 1377 "mercurial", |
| 1378 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" | 1378 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" |
| 1379 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" | 1379 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" |
| 1380 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\ | 1380 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""") |
| 1381 .format(author, cdate, ctime)) | 1381 .format(author, cdate, ctime)) |
| 1382 infoBlock.append("\n".join(info)) | 1382 infoBlock.append("\n".join(info)) |
| 1383 if infoBlock: | 1383 if infoBlock: |
| 1384 infoStr = """<tr></tr>{0}""".format("<tr></tr>".join(infoBlock)) | 1384 infoStr = """<tr></tr>{0}""".format("<tr></tr>".join(infoBlock)) |
| 1385 else: | 1385 else: |
| 1539 output, error = self.__client.runcommand(args) | 1539 output, error = self.__client.runcommand(args) |
| 1540 | 1540 |
| 1541 if output: | 1541 if output: |
| 1542 self.tagsList = [] | 1542 self.tagsList = [] |
| 1543 for line in output.splitlines(): | 1543 for line in output.splitlines(): |
| 1544 l = line.strip().split() | 1544 li = line.strip().split() |
| 1545 if l[-1][0] in "1234567890": | 1545 if li[-1][0] in "1234567890": |
| 1546 # last element is a rev:changeset | 1546 # last element is a rev:changeset |
| 1547 del l[-1] | 1547 del li[-1] |
| 1548 else: | 1548 else: |
| 1549 del l[-2:] | 1549 del li[-2:] |
| 1550 name = " ".join(l) | 1550 name = " ".join(li) |
| 1551 if name not in ["tip", "default"]: | 1551 if name not in ["tip", "default"]: |
| 1552 self.tagsList.append(name) | 1552 self.tagsList.append(name) |
| 1553 | 1553 |
| 1554 return self.tagsList[:] | 1554 return self.tagsList[:] |
| 1555 | 1555 |
| 1581 output, error = self.__client.runcommand(args) | 1581 output, error = self.__client.runcommand(args) |
| 1582 | 1582 |
| 1583 if output: | 1583 if output: |
| 1584 self.branchesList = [] | 1584 self.branchesList = [] |
| 1585 for line in output.splitlines(): | 1585 for line in output.splitlines(): |
| 1586 l = line.strip().split() | 1586 li = line.strip().split() |
| 1587 if l[-1][0] in "1234567890": | 1587 if li[-1][0] in "1234567890": |
| 1588 # last element is a rev:changeset | 1588 # last element is a rev:changeset |
| 1589 del l[-1] | 1589 del li[-1] |
| 1590 else: | 1590 else: |
| 1591 del l[-2:] | 1591 del li[-2:] |
| 1592 name = " ".join(l) | 1592 name = " ".join(li) |
| 1593 if name not in ["tip", "default"]: | 1593 if name not in ["tip", "default"]: |
| 1594 self.branchesList.append(name) | 1594 self.branchesList.append(name) |
| 1595 | 1595 |
| 1596 return self.branchesList[:] | 1596 return self.branchesList[:] |
| 1597 | 1597 |
| 2012 info.append(QApplication.translate( | 2012 info.append(QApplication.translate( |
| 2013 "mercurial", | 2013 "mercurial", |
| 2014 """<tr><td><b>Tip</b></td><td></td></tr>\n""")) | 2014 """<tr><td><b>Tip</b></td><td></td></tr>\n""")) |
| 2015 info.append(QApplication.translate( | 2015 info.append(QApplication.translate( |
| 2016 "mercurial", | 2016 "mercurial", |
| 2017 """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\ | 2017 """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""") |
| 2018 .format(changeset)) | 2018 .format(changeset)) |
| 2019 if tags: | 2019 if tags: |
| 2020 info.append(QApplication.translate( | 2020 info.append(QApplication.translate( |
| 2021 "mercurial", | 2021 "mercurial", |
| 2022 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ | 2022 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") |
| 2023 .format('<br/>'.join(tags.split()))) | 2023 .format('<br/>'.join(tags.split()))) |
| 2024 if bookmarks: | 2024 if bookmarks: |
| 2025 info.append(QApplication.translate( | 2025 info.append(QApplication.translate( |
| 2026 "mercurial", | 2026 "mercurial", |
| 2027 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""")\ | 2027 """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") |
| 2028 .format('<br/>'.join(bookmarks.split()))) | 2028 .format('<br/>'.join(bookmarks.split()))) |
| 2029 if branches: | 2029 if branches: |
| 2030 info.append(QApplication.translate( | 2030 info.append(QApplication.translate( |
| 2031 "mercurial", | 2031 "mercurial", |
| 2032 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ | 2032 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") |
| 2033 .format('<br/>'.join(branches.split()))) | 2033 .format('<br/>'.join(branches.split()))) |
| 2034 if parents: | 2034 if parents: |
| 2035 info.append(QApplication.translate( | 2035 info.append(QApplication.translate( |
| 2036 "mercurial", | 2036 "mercurial", |
| 2037 """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\ | 2037 """<tr><td><b>Parents</b></td><td>{0}</td></tr>""") |
| 2038 .format('<br/>'.join(parents.split()))) | 2038 .format('<br/>'.join(parents.split()))) |
| 2039 info.append(QApplication.translate( | 2039 info.append(QApplication.translate( |
| 2040 "mercurial", | 2040 "mercurial", |
| 2041 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" | 2041 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" |
| 2042 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" | 2042 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" |
| 2043 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" | 2043 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" |
| 2044 """</table></p>""")\ | 2044 """</table></p>""") |
| 2045 .format(author, cdate, ctime)) | 2045 .format(author, cdate, ctime)) |
| 2046 | 2046 |
| 2047 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) | 2047 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) |
| 2048 dlg.exec_() | 2048 dlg.exec_() |
| 2049 | 2049 |
