1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108
|
from functools import partial
import os
import re
from qtpy import QtCore
from qtpy import QtGui
from qtpy import QtWidgets
from qtpy.QtCore import Qt
from qtpy.QtCore import Signal
from ..i18n import N_
from ..editpatch import edit_patch
from ..interaction import Interaction
from ..models import main
from ..models import prefs
from ..qtutils import get
from .. import actions
from .. import cmds
from .. import core
from .. import diffparse
from .. import gitcmds
from .. import gravatar
from .. import hotkeys
from .. import icons
from .. import utils
from .. import qtutils
from .text import TextDecorator
from .text import VimHintedPlainTextEdit
from .text import PlainTextLabel
from .text import TextSearchWidget
from .text import label_selection_timer
from . import defs
from . import standard
from . import imageview
class DiffSyntaxHighlighter(QtGui.QSyntaxHighlighter):
"""Implements the diff syntax highlighting"""
INITIAL_STATE = -1
DEFAULT_STATE = 0
DIFFSTAT_STATE = 1
DIFF_FILE_HEADER_STATE = 2
DIFF_STATE = 3
SUBMODULE_STATE = 4
END_STATE = 5
DIFF_FILE_HEADER_START_RGX = re.compile(r'diff --git a/.* b/.*')
DIFF_HUNK_HEADER_RGX = re.compile(
r'(?:@@ -[0-9,]+ \+[0-9,]+ @@)|(?:@@@ (?:-[0-9,]+ ){2}\+[0-9,]+ @@@)'
)
BAD_WHITESPACE_RGX = re.compile(r'\s+$')
def __init__(self, context, doc, whitespace=True, is_commit=False):
QtGui.QSyntaxHighlighter.__init__(self, doc)
self.whitespace = whitespace
self.enabled = True
self.is_commit = is_commit
QPalette = QtGui.QPalette
cfg = context.cfg
palette = QPalette()
disabled = palette.color(QPalette.Disabled, QPalette.Text)
header = qtutils.rgb_hex(disabled)
dark = palette.color(QPalette.Base).lightnessF() < 0.5
self.color_text = qtutils.rgb_triple(cfg.color('text', '030303'))
self.color_add = qtutils.rgb_triple(
cfg.color('add', '77aa77' if dark else 'd2ffe4')
)
self.color_remove = qtutils.rgb_triple(
cfg.color('remove', 'aa7777' if dark else 'fee0e4')
)
self.color_header = qtutils.rgb_triple(cfg.color('header', header))
self.diff_header_fmt = qtutils.make_format(foreground=self.color_header)
self.bold_diff_header_fmt = qtutils.make_format(
foreground=self.color_header, bold=True
)
self.diff_add_fmt = qtutils.make_format(
foreground=self.color_text, background=self.color_add
)
self.diff_remove_fmt = qtutils.make_format(
foreground=self.color_text, background=self.color_remove
)
self.bad_whitespace_fmt = qtutils.make_format(background=Qt.red)
self.setCurrentBlockState(self.INITIAL_STATE)
def set_enabled(self, enabled):
self.enabled = enabled
def highlightBlock(self, text):
"""Highlight the current text block"""
if not self.enabled or not text:
return
formats = []
state = self.get_next_state(text)
if state == self.DIFFSTAT_STATE:
state, formats = self.get_formats_for_diffstat(state, text)
elif state == self.DIFF_FILE_HEADER_STATE:
state, formats = self.get_formats_for_diff_header(state, text)
elif state == self.DIFF_STATE:
state, formats = self.get_formats_for_diff_text(state, text)
for start, end, fmt in formats:
self.setFormat(start, end, fmt)
self.setCurrentBlockState(state)
def get_next_state(self, text):
"""Transition to the next state based on the input text"""
state = self.previousBlockState()
if state == DiffSyntaxHighlighter.INITIAL_STATE:
if text.startswith('Submodule '):
state = DiffSyntaxHighlighter.SUBMODULE_STATE
elif text.startswith('diff --git '):
state = DiffSyntaxHighlighter.DIFFSTAT_STATE
elif self.is_commit:
state = DiffSyntaxHighlighter.DEFAULT_STATE
else:
state = DiffSyntaxHighlighter.DIFFSTAT_STATE
return state
def get_formats_for_diffstat(self, state, text):
"""Returns (state, [(start, end, fmt), ...]) for highlighting diffstat text"""
formats = []
if self.DIFF_FILE_HEADER_START_RGX.match(text):
state = self.DIFF_FILE_HEADER_STATE
end = len(text)
fmt = self.diff_header_fmt
formats.append((0, end, fmt))
elif self.DIFF_HUNK_HEADER_RGX.match(text):
state = self.DIFF_STATE
end = len(text)
fmt = self.bold_diff_header_fmt
formats.append((0, end, fmt))
elif '|' in text:
offset = text.index('|')
formats.append((0, offset, self.bold_diff_header_fmt))
formats.append((offset, len(text) - offset, self.diff_header_fmt))
else:
formats.append((0, len(text), self.diff_header_fmt))
return state, formats
def get_formats_for_diff_header(self, state, text):
"""Returns (state, [(start, end, fmt), ...]) for highlighting diff headers"""
formats = []
if self.DIFF_HUNK_HEADER_RGX.match(text):
state = self.DIFF_STATE
formats.append((0, len(text), self.bold_diff_header_fmt))
else:
formats.append((0, len(text), self.diff_header_fmt))
return state, formats
def get_formats_for_diff_text(self, state, text):
"""Return (state, [(start, end fmt), ...]) for highlighting diff text"""
formats = []
if self.DIFF_FILE_HEADER_START_RGX.match(text):
state = self.DIFF_FILE_HEADER_STATE
formats.append((0, len(text), self.diff_header_fmt))
elif self.DIFF_HUNK_HEADER_RGX.match(text):
formats.append((0, len(text), self.bold_diff_header_fmt))
elif text.startswith('-'):
if text == '-- ':
state = self.END_STATE
else:
formats.append((0, len(text), self.diff_remove_fmt))
elif text.startswith('+'):
formats.append((0, len(text), self.diff_add_fmt))
if self.whitespace:
match = self.BAD_WHITESPACE_RGX.search(text)
if match is not None:
start = match.start()
formats.append((start, len(text) - start, self.bad_whitespace_fmt))
return state, formats
class DiffTextEdit(VimHintedPlainTextEdit):
"""A textedit for interacting with diff text"""
def __init__(
self, context, parent, is_commit=False, whitespace=True, numbers=False
):
super().__init__(context, '', parent=parent)
# Diff/patch syntax highlighter
self.max_diff_size = 0
self.highlighter = DiffSyntaxHighlighter(
context, self.document(), is_commit=is_commit, whitespace=whitespace
)
self.diff_lines = diffparse.DiffLines()
if numbers:
self.numbers = DiffLineNumbers(context, self, diff_lines=self.diff_lines)
self.numbers.hide()
else:
self.numbers = None
self.scrollvalue = None
self.copy_diff_action = qtutils.add_action_with_icon(
self,
icons.copy(),
N_('Copy Diff'),
self.copy_diff,
hotkeys.COPY_DIFF,
)
self.copy_diff_action.setEnabled(False)
self.menu_actions.append(self.copy_diff_action)
self.cursorPositionChanged.connect(self._cursor_changed)
self.selectionChanged.connect(self._selection_changed)
self.mouse_zoomed.connect(self.update_block_cursor)
def setFont(self, font):
"""Override setFont() so that we can use a custom "block" cursor"""
super().setFont(font)
self.update_block_cursor(font=font)
def update_block_cursor(self, font=None):
"""Update the block cusor width"""
self._update_block_cursor(self.context, font=font)
def _update_block_cursor(self, context, font=None):
"""Update the block cusor width"""
if not prefs.block_cursor(context):
return
if font is None:
font = self.font()
width = qtutils.text_width(font, 'M')
self.setCursorWidth(width)
def _cursor_changed(self):
"""Update the line number display when the cursor changes"""
line_number = max(0, self.textCursor().blockNumber())
if self.numbers is not None:
self.numbers.set_highlighted(line_number)
def _selection_changed(self):
"""Respond to selection changes"""
selected = bool(self.selected_text())
self.copy_diff_action.setEnabled(selected)
def resizeEvent(self, event):
super().resizeEvent(event)
if self.numbers:
self.numbers.refresh_size()
def save_scrollbar(self):
"""Save the scrollbar value, but only on the first call"""
if self.scrollvalue is None:
scrollbar = self.verticalScrollBar()
if scrollbar:
scrollvalue = get(scrollbar)
else:
scrollvalue = None
self.scrollvalue = scrollvalue
def restore_scrollbar(self):
"""Restore the scrollbar and clear state"""
scrollbar = self.verticalScrollBar()
scrollvalue = self.scrollvalue
if scrollbar and scrollvalue is not None:
scrollbar.setValue(scrollvalue)
self.scrollvalue = None
def set_diff(self, diff):
"""Set the diff text and restore the scrollbar position post-update"""
diff = diff.rstrip('\n') # diffs include two empty newlines
diff = _truncate_diff(diff, self.max_diff_size)
self.save_scrollbar()
lines = self.diff_lines.parse(diff)
if self.numbers:
# The diff_lines parser is shared with self.numbers and updated above.
self.numbers.set_diff(diff, lines=lines)
self.set_value(diff)
self.restore_scrollbar()
def selected_diff_stripped(self):
"""Return the selected diff stripped of any diff characters"""
sep, selection = self.selected_text_lines()
return sep.join(_strip_diff(line) for line in selection)
def copy_diff(self):
"""Copy the selected diff text stripped of any diff prefix characters"""
text = self.selected_diff_stripped()
qtutils.set_clipboard(text)
def selected_lines(self):
"""Return selected lines"""
cursor = self.textCursor()
selection_start = cursor.selectionStart()
selection_end = max(selection_start, cursor.selectionEnd() - 1)
first_line_idx = -1
last_line_idx = -1
line_idx = 0
line_start = 0
for line_idx, line in enumerate(get(self, default='').splitlines()):
line_end = line_start + len(line)
if line_start <= selection_start <= line_end:
first_line_idx = line_idx
if line_start <= selection_end <= line_end:
last_line_idx = line_idx
break
line_start = line_end + 1
if first_line_idx == -1:
first_line_idx = line_idx
if last_line_idx == -1:
last_line_idx = line_idx
return first_line_idx, last_line_idx
def selected_text_lines(self):
"""Return selected lines and the CRLF / LF separator"""
first_line_idx, last_line_idx = self.selected_lines()
text = get(self, default='')
sep = _get_sep(text)
lines = []
for line_idx, line in enumerate(text.split(sep)):
if first_line_idx <= line_idx <= last_line_idx:
lines.append(line)
return sep, lines
def _get_sep(text):
"""Return either CRLF or LF based on the content"""
if '\r\n' in text:
sep = '\r\n'
else:
sep = '\n'
return sep
def _strip_diff(value):
"""Remove +/-/<space> from a selection"""
if value.startswith(('+', '-', ' ')):
return value[1:]
return value
def _truncate_diff(value, size):
"""Truncate the diff to the specified number of megabytes"""
if size == 0: # Unlimited
return value
# Technically size represents the number of unicode tokens not bytes, but it's good
# enough given that usually we're dealing with utf-8 text.
count = size * 1024 * 1024
if len(value) <= count:
return value
# Find the last newline starting from size so that the last line is a full, complete
# line rather than an invalid truncated invalid diff value.
newline = value.rfind('\n', 0, count)
if newline == -1:
return value[:count]
return value[:newline]
class DiffLineNumbers(TextDecorator):
"""The diff viewer's line number display"""
def __init__(self, context, parent, diff_lines=None):
TextDecorator.__init__(self, parent)
self.highlight_line = -1
self.lines = None
self.parser = diff_lines or diffparse.DiffLines()
self.formatter = diffparse.FormatDigits()
font = qtutils.diff_font(context)
self.setFont(font)
self._char_width = qtutils.text_width(font, 'M')
QPalette = QtGui.QPalette
self._palette = palette = self.palette()
self._base = palette.color(QtGui.QPalette.Base)
self._highlight = palette.color(QPalette.Highlight)
self._highlight.setAlphaF(0.3)
self._highlight_text = palette.color(QPalette.HighlightedText)
self._window = palette.color(QPalette.Window)
self._disabled = palette.color(QPalette.Disabled, QPalette.Text)
def set_diff(self, diff, lines=None):
"""Update to a new diff display"""
if lines is None:
lines = self.parser.parse(diff)
self.lines = lines
self.formatter.set_digits(self.parser.digits())
def width_hint(self):
if not self.isVisible():
return 0
parser = self.parser
if parser.merge:
columns = 3
extra = 3 # one space in-between, one space after
else:
columns = 2
extra = 2 # one space in-between, one space after
digits = parser.digits() * columns
return defs.margin + (self._char_width * (digits + extra))
def set_highlighted(self, line_number):
"""Set the line to highlight"""
self.highlight_line = line_number
def current_line(self):
lines = self.lines
if lines and self.highlight_line >= 0:
# Find the next valid line
for i in range(self.highlight_line, len(lines)):
# take the "new" line number: last value in tuple
line_number = lines[i][-1]
if line_number > 0:
return line_number
# Find the previous valid line
for i in range(self.highlight_line - 1, -1, -1):
# take the "new" line number: last value in tuple
if i < len(lines):
line_number = lines[i][-1]
if line_number > 0:
return line_number
return None
def paintEvent(self, event):
"""Paint the line number"""
if not self.lines:
return
painter = QtGui.QPainter(self)
painter.fillRect(event.rect(), self._base)
editor = self.editor
content_offset = editor.contentOffset()
block = editor.firstVisibleBlock()
width = self.width()
text_width = width - (defs.margin * 2)
text_flags = Qt.AlignRight | Qt.AlignVCenter
event_rect_bottom = event.rect().bottom()
highlight_line = self.highlight_line
highlight = self._highlight
highlight_text = self._highlight_text
disabled = self._disabled
fmt = self.formatter
lines = self.lines
num_lines = len(lines)
while block.isValid():
block_number = block.blockNumber()
if block_number >= num_lines:
break
block_geom = editor.blockBoundingGeometry(block)
rect = block_geom.translated(content_offset).toRect()
if not block.isVisible() or rect.top() >= event_rect_bottom:
break
if block_number == highlight_line:
painter.fillRect(rect.x(), rect.y(), width, rect.height(), highlight)
painter.setPen(highlight_text)
else:
painter.setPen(disabled)
line = lines[block_number]
if len(line) == 2:
a, b = line
text = fmt.value(a, b)
elif len(line) == 3:
old, base, new = line
text = fmt.merge_value(old, base, new)
painter.drawText(
rect.x(),
rect.y(),
text_width,
rect.height(),
text_flags,
text,
)
block = block.next()
class Viewer(QtWidgets.QFrame):
"""Text and image diff viewers"""
INDEX_TEXT = 0
INDEX_IMAGE = 1
def __init__(self, context, parent=None):
super().__init__(parent)
self.context = context
self.model = model = context.model
self.images = []
self.pixmaps = []
self.options = options = Options(self)
italic_font = self.font()
italic_font.setItalic(True)
self.filename = PlainTextLabel(parent=self)
self.filename.setAlignment(Qt.AlignVCenter | Qt.AlignLeft)
self.filename.setFont(italic_font)
self.filename.elide()
diffstat_font = self.font()
diffstat_font.setPointSize(diffstat_font.pointSize() - 1)
self.diffstat = PlainTextLabel(parent=self)
self.diffstat.setAlignment(Qt.AlignVCenter | Qt.AlignRight)
self.diffstat.setFont(diffstat_font)
self.text = DiffEditor(context, options, self)
self.image = imageview.ImageView(parent=self)
self.image.setFocusPolicy(Qt.NoFocus)
self.search_widget = TextSearchWidget(self.text, self)
self.search_widget.hide()
self._drag_has_patches = False
self.setAcceptDrops(True)
self.setFocusProxy(self.text)
stack = self.stack = QtWidgets.QStackedWidget(self)
stack.addWidget(self.text)
stack.addWidget(self.image)
self.main_layout = qtutils.vbox(
defs.no_margin,
defs.no_spacing,
self.stack,
self.search_widget,
)
self.setLayout(self.main_layout)
# Observe images
model.images_changed.connect(self.set_images, type=Qt.QueuedConnection)
# Observe the diff type
model.diff_type_changed.connect(self.set_diff_type, type=Qt.QueuedConnection)
# Observe the file type
model.file_type_changed.connect(self.set_file_type, type=Qt.QueuedConnection)
# Observe the diff text
model.diff_text_updated.connect(self.set_diff, type=Qt.QueuedConnection)
# Observe the diff loading state
self.context.notifier.listen(
cmds.Messages.DIFF_LOADING, self.set_loading_message
)
# Observe the image mode combo box
options.image_mode.currentIndexChanged.connect(lambda _: self.render())
options.zoom_mode.currentIndexChanged.connect(lambda _: self.render())
self.search_action = qtutils.add_action(
self,
N_('Search in Diff'),
self.show_search_diff,
hotkeys.SEARCH,
)
def set_loading_message(self):
"""Display an indicator that a diff is loading in the background"""
# The diffstat will be replaced with the real diffstat on load.
self.diffstat.set_text(N_('Loading...'))
def dragEnterEvent(self, event):
"""Accepts drops if the mimedata contains patches"""
super().dragEnterEvent(event)
patches = get_patches_from_mimedata(event.mimeData())
if patches:
event.acceptProposedAction()
self._drag_has_patches = True
def dragLeaveEvent(self, event):
"""End the drag+drop interaction"""
super().dragLeaveEvent(event)
if self._drag_has_patches:
event.accept()
else:
event.ignore()
self._drag_has_patches = False
def dropEvent(self, event):
"""Apply patches when dropped onto the widget"""
if not self._drag_has_patches:
event.ignore()
return
event.setDropAction(Qt.CopyAction)
super().dropEvent(event)
self._drag_has_patches = False
patches = get_patches_from_mimedata(event.mimeData())
if patches:
apply_patches(self.context, patches=patches)
event.accept() # must be called after dropEvent()
def show_search_diff(self):
"""Show a dialog for searching diffs"""
# The diff search is only active in text mode.
if self.stack.currentIndex() != self.INDEX_TEXT:
return
if not self.search_widget.isVisible():
self.search_widget.show()
self.search_widget.setFocus()
def export_state(self, state):
state['show_diff_line_numbers'] = self.options.show_line_numbers.isChecked()
state['show_diff_filenames'] = self.options.show_filenames.isChecked()
state['image_diff_mode'] = self.options.image_mode.currentIndex()
state['image_zoom_mode'] = self.options.zoom_mode.currentIndex()
state['word_wrap'] = self.options.enable_word_wrapping.isChecked()
state['max_diff_size'] = self.options.max_diff_spinbox.value()
return state
def apply_state(self, state):
diff_numbers = bool(state.get('show_diff_line_numbers', False))
self.set_line_numbers(diff_numbers, update=True)
show_filenames = bool(state.get('show_diff_filenames', True))
self.set_show_filenames(show_filenames, update=True)
image_mode = utils.asint(state.get('image_diff_mode', 0))
self.options.image_mode.set_index(image_mode)
zoom_mode = utils.asint(state.get('image_zoom_mode', 0))
self.options.zoom_mode.set_index(zoom_mode)
word_wrap = bool(state.get('word_wrap', True))
self.set_word_wrapping(word_wrap, update=True)
max_diff_size = state.get('max_diff_size', 1)
self.text.max_diff_size = max_diff_size
self.options.max_diff_spinbox.set_value(max_diff_size)
return True
def set_diff(self, diff):
"""Update the diffstat display in reponse to the new diff"""
filename = self.context.selection.filename()
if filename:
removals = self.text.diff_lines.removals.count
additions = self.text.diff_lines.additions.count
diffstat = f'-{removals} +{additions}'
else:
diffstat = ''
self.diffstat.set_text(diffstat)
def set_diff_type(self, diff_type):
"""Manage the image and text diff views when selection changes"""
# The "diff type" is whether the diff viewer is displaying an image.
self.options.set_diff_type(diff_type)
if diff_type == main.Types.IMAGE:
self.stack.setCurrentWidget(self.image)
self.search_widget.hide()
self.render()
else:
self.stack.setCurrentWidget(self.text)
def set_file_type(self, file_type):
"""Manage the diff options when the file type changes"""
# The "file type" is whether the file itself is an image.
self.options.set_file_type(file_type)
def enable_filename_tracking(self):
"""Enable displaying the currently selected filename"""
self.context.selection.selection_changed.connect(
self.update_filename, type=Qt.QueuedConnection
)
def update_filename(self):
"""Update the filename display when the selection changes"""
filename = self.context.selection.filename()
self.filename.set_text(filename or '')
def update_options(self):
"""Emit a signal indicating that options have changed"""
self.text.update_options()
show_filenames = get(self.options.show_filenames)
self.set_show_filenames(show_filenames)
def set_show_filenames(self, enabled, update=False):
"""Enable/disable displaying the selected filename"""
self.filename.setVisible(enabled)
self.diffstat.setVisible(enabled)
if update:
with qtutils.BlockSignals(self.options.show_filenames):
self.options.show_filenames.setChecked(enabled)
def set_line_numbers(self, enabled, update=False):
"""Enable/disable line numbers in the text widget"""
self.text.set_line_numbers(enabled, update=update)
def set_word_wrapping(self, enabled, update=False):
"""Enable/disable word wrapping in the text widget"""
self.text.set_word_wrapping(enabled, update=update)
def reset(self):
self.image.pixmap = QtGui.QPixmap()
self.cleanup()
def cleanup(self):
for image, unlink in self.images:
if unlink and core.exists(image):
os.unlink(image)
self.images = []
def set_images(self, images):
self.images = images
self.pixmaps = []
if not images:
self.reset()
return False
# In order to comp, we first have to load all the images
all_pixmaps = [QtGui.QPixmap(image[0]) for image in images]
pixmaps = [pixmap for pixmap in all_pixmaps if not pixmap.isNull()]
if not pixmaps:
self.reset()
return False
self.pixmaps = pixmaps
self.render()
self.cleanup()
return True
def render(self):
# Update images
if self.pixmaps:
mode = self.options.image_mode.currentIndex()
if mode == self.options.SIDE_BY_SIDE:
image = self.render_side_by_side()
elif mode == self.options.DIFF:
image = self.render_diff()
elif mode == self.options.XOR:
image = self.render_xor()
elif mode == self.options.PIXEL_XOR:
image = self.render_pixel_xor()
else:
image = self.render_side_by_side()
else:
image = QtGui.QPixmap()
self.image.pixmap = image
# Apply zoom
zoom_mode = self.options.zoom_mode.currentIndex()
zoom_factor = self.options.zoom_factors[zoom_mode][1]
if zoom_factor > 0.0:
self.image.resetTransform()
self.image.scale(zoom_factor, zoom_factor)
poly = self.image.mapToScene(self.image.viewport().rect())
self.image.last_scene_roi = poly.boundingRect()
def render_side_by_side(self):
# Side-by-side lineup comp
pixmaps = self.pixmaps
width = sum(pixmap.width() for pixmap in pixmaps)
height = max(pixmap.height() for pixmap in pixmaps)
image = create_image(width, height)
# Paint each pixmap
painter = create_painter(image)
x = 0
for pixmap in pixmaps:
painter.drawPixmap(x, 0, pixmap)
x += pixmap.width()
painter.end()
return image
def render_comp(self, comp_mode):
# Get the max size to use as the render canvas
pixmaps = self.pixmaps
if len(pixmaps) == 1:
return pixmaps[0]
width = max(pixmap.width() for pixmap in pixmaps)
height = max(pixmap.height() for pixmap in pixmaps)
image = create_image(width, height)
painter = create_painter(image)
for pixmap in (pixmaps[0], pixmaps[-1]):
x = (width - pixmap.width()) // 2
y = (height - pixmap.height()) // 2
painter.drawPixmap(x, y, pixmap)
painter.setCompositionMode(comp_mode)
painter.end()
return image
def render_diff(self):
comp_mode = QtGui.QPainter.CompositionMode_Difference
return self.render_comp(comp_mode)
def render_xor(self):
comp_mode = QtGui.QPainter.CompositionMode_Xor
return self.render_comp(comp_mode)
def render_pixel_xor(self):
comp_mode = QtGui.QPainter.RasterOp_SourceXorDestination
return self.render_comp(comp_mode)
def create_image(width, height):
size = QtCore.QSize(width, height)
image = QtGui.QImage(size, QtGui.QImage.Format_ARGB32_Premultiplied)
image.fill(Qt.transparent)
return image
def create_painter(image):
painter = QtGui.QPainter(image)
painter.fillRect(image.rect(), Qt.transparent)
return painter
class Options(QtWidgets.QWidget):
"""Provide the options widget used by the editor
Actions are registered on the parent widget.
"""
# mode combobox indexes
SIDE_BY_SIDE = 0
DIFF = 1
XOR = 2
PIXEL_XOR = 3
def __init__(self, parent):
super().__init__(parent)
# Create widgets
self.widget = parent
self.ignore_space_at_eol = self.add_option(
N_('Ignore changes in whitespace at EOL')
)
self.ignore_space_change = self.add_option(
N_('Ignore changes in amount of whitespace')
)
self.ignore_all_space = self.add_option(N_('Ignore all whitespace'))
self.function_context = self.add_option(
N_('Show whole surrounding functions of changes')
)
self.show_line_numbers = qtutils.add_action_bool(
self, N_('Show line numbers'), self.set_line_numbers, True
)
self.show_filenames = self.add_option(N_('Show filenames'))
self.enable_word_wrapping = qtutils.add_action_bool(
self, N_('Enable word wrapping'), self.set_word_wrapping, True
)
self.max_diff_label = QtWidgets.QLabel(
N_('Maximum diff size in megabytes (MB)'), self
)
self.max_diff_spinbox = standard.SpinBox(
value=1,
mini=0,
maxi=9999,
suffix='\tMB',
tooltip=N_('The maximum diff size in megabytes (MB)'),
parent=self,
)
self.max_diff_spinbox.setSpecialValueText(N_('Unlimited'))
self.max_diff_widget = QtWidgets.QWidget(self)
self.max_diff_layout = qtutils.hbox(
defs.no_margin,
defs.button_spacing,
self.max_diff_label,
qtutils.STRETCH,
self.max_diff_spinbox,
)
self.max_diff_widget.setLayout(self.max_diff_layout)
self.max_diff_action = QtWidgets.QWidgetAction(self)
self.max_diff_action.setDefaultWidget(self.max_diff_widget)
self.options = qtutils.create_toolbutton(
tooltip=N_('Diff Options'), icon=icons.configure()
)
self.toggle_image_diff = qtutils.create_action_button(
tooltip=N_('Toggle image diff'), icon=icons.visualize()
)
self.toggle_image_diff.hide()
self.image_mode = qtutils.combo(
[N_('Side by side'), N_('Diff'), N_('XOR'), N_('Pixel XOR')]
)
self.zoom_factors = (
(N_('Zoom to Fit'), 0.0),
(N_('25%'), 0.25),
(N_('50%'), 0.5),
(N_('100%'), 1.0),
(N_('200%'), 2.0),
(N_('400%'), 4.0),
(N_('800%'), 8.0),
)
zoom_modes = [factor[0] for factor in self.zoom_factors]
self.zoom_mode = qtutils.combo(zoom_modes, parent=self)
self.menu = menu = qtutils.create_menu(N_('Diff Options'), self.options)
self.options.setMenu(menu)
menu.addAction(self.max_diff_action)
menu.addSeparator()
menu.addAction(self.ignore_space_at_eol)
menu.addAction(self.ignore_space_change)
menu.addAction(self.ignore_all_space)
menu.addSeparator()
menu.addAction(self.function_context)
menu.addAction(self.show_line_numbers)
menu.addAction(self.show_filenames)
menu.addSeparator()
menu.addAction(self.enable_word_wrapping)
# Layouts
layout = qtutils.hbox(
defs.no_margin,
defs.button_spacing,
self.image_mode,
self.zoom_mode,
self.options,
self.toggle_image_diff,
)
self.setLayout(layout)
# Policies
self.image_mode.setFocusPolicy(Qt.NoFocus)
self.zoom_mode.setFocusPolicy(Qt.NoFocus)
self.options.setFocusPolicy(Qt.NoFocus)
self.toggle_image_diff.setFocusPolicy(Qt.NoFocus)
self.setFocusPolicy(Qt.NoFocus)
def set_file_type(self, file_type):
"""Set whether we are viewing an image file type"""
is_image = file_type == main.Types.IMAGE
self.toggle_image_diff.setVisible(is_image)
def set_diff_type(self, diff_type):
"""Toggle between image and text diffs"""
is_text = diff_type == main.Types.TEXT
is_image = diff_type == main.Types.IMAGE
self.options.setVisible(is_text)
self.image_mode.setVisible(is_image)
self.zoom_mode.setVisible(is_image)
if is_image:
self.toggle_image_diff.setIcon(icons.diff())
else:
self.toggle_image_diff.setIcon(icons.visualize())
def add_option(self, title):
"""Add a diff option which calls update_options() on change"""
action = qtutils.add_action(self, title, self.update_options)
action.setCheckable(True)
return action
def update_options(self):
"""Update diff options in response to UI events"""
space_at_eol = get(self.ignore_space_at_eol)
space_change = get(self.ignore_space_change)
all_space = get(self.ignore_all_space)
function_context = get(self.function_context)
gitcmds.update_diff_overrides(
space_at_eol, space_change, all_space, function_context
)
self.widget.update_options()
def set_line_numbers(self, value):
"""Enable / disable line numbers"""
self.widget.set_line_numbers(value, update=False)
def set_word_wrapping(self, value):
"""Respond to Qt action callbacks"""
self.widget.set_word_wrapping(value, update=False)
def hide_advanced_options(self):
"""Hide advanced options that are not applicable to the CommitDiffWidget"""
self.show_filenames.setVisible(False)
self.show_line_numbers.setVisible(False)
self.ignore_space_at_eol.setVisible(False)
self.ignore_space_change.setVisible(False)
self.ignore_all_space.setVisible(False)
self.function_context.setVisible(False)
class DiffEditor(DiffTextEdit):
up = Signal()
down = Signal()
options_changed = Signal()
def __init__(self, context, options, parent):
DiffTextEdit.__init__(self, context, parent, numbers=True)
self.context = context
self.model = model = context.model
self.selection_model = selection_model = context.selection
# "Diff Options" tool menu
self.options = options
self.action_apply_selection = qtutils.add_action(
self,
N_('Apply'),
self.apply_selection,
hotkeys.STAGE_DIFF,
hotkeys.STAGE_DIFF_ALT,
)
self.action_revert_selection = qtutils.add_action_with_icon(
self,
icons.undo(),
N_('Revert Selected Lines'),
self.revert_selection,
hotkeys.REVERT,
hotkeys.REVERT_ALT,
)
self.action_revert_unstaged_edits = qtutils.add_action_with_icon(
self,
icons.undo(),
cmds.RevertUnstagedEdits.name(),
cmds.run(cmds.RevertUnstagedEdits, self.context),
hotkeys.REVERT_UNSTAGED_EDITS,
)
self.action_edit_and_apply_selection = qtutils.add_action(
self,
N_('Edit and Apply'),
partial(self.apply_selection, edit=True),
hotkeys.EDIT_AND_STAGE_DIFF,
)
self.action_edit_and_revert_selection = qtutils.add_action(
self,
N_('Edit and Revert'),
partial(self.revert_selection, edit=True),
hotkeys.EDIT_AND_REVERT,
)
self.action_edit_and_revert_selection.setIcon(icons.undo())
self.launch_editor = actions.launch_editor_at_line(
context, self, hotkeys.EDIT_SHORT, *hotkeys.ACCEPT
)
self.launch_difftool = actions.launch_difftool(context, self)
self.stage_or_unstage = actions.stage_or_unstage(context, self)
# Emit up/down signals so that they can be routed by the main widget
self.move_up = actions.move_up(self)
self.move_down = actions.move_down(self)
model.diff_text_updated.connect(self.set_diff, type=Qt.QueuedConnection)
selection_model.selection_changed.connect(
self.refresh, type=Qt.QueuedConnection
)
# Update the selection model when the cursor changes
self.cursorPositionChanged.connect(self._update_line_number)
qtutils.connect_button(options.toggle_image_diff, self.toggle_diff_type)
self.options.max_diff_spinbox.valueChanged.connect(self.set_max_diff_size)
def set_max_diff_size(self, value):
"""Set the max diff state on the diff widget"""
self.max_diff_size = value
def toggle_diff_type(self):
cmds.do(cmds.ToggleDiffType, self.context)
def refresh(self):
enabled = False
s = self.selection_model.selection()
model = self.model
if model.is_partially_stageable():
item = s.modified[0] if s.modified else None
if item in model.submodules:
pass
elif item not in model.unstaged_deleted:
enabled = True
self.action_revert_selection.setEnabled(enabled)
def set_line_numbers(self, enabled, update=False):
"""Enable/disable the diff line number display"""
self.numbers.setVisible(enabled)
if update:
with qtutils.BlockSignals(self.options.show_line_numbers):
self.options.show_line_numbers.setChecked(enabled)
# Refresh the display. Not doing this results in the display not
# correctly displaying the line numbers widget until the text scrolls.
self.set_value(self.value())
def update_options(self):
self.options_changed.emit()
def create_context_menu(self, event_pos):
"""Override create_context_menu() to display a completely custom menu"""
menu = super().create_context_menu(event_pos)
context = self.context
model = self.model
s = self.selection_model.selection()
filename = self.selection_model.filename()
# These menu actions will be inserted at the start of the widget.
current_actions = menu.actions()
menu_actions = []
add_action = menu_actions.append
edit_actions_added = False
stage_action_added = False
if s.staged and model.is_unstageable():
item = s.staged[0]
if item not in model.submodules and item not in model.staged_deleted:
if self.has_selection():
apply_text = N_('Unstage Selected Lines')
else:
apply_text = N_('Unstage Diff Hunk')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.remove())
add_action(self.action_apply_selection)
stage_action_added = self._add_stage_or_unstage_action(
menu, add_action, stage_action_added
)
if model.is_partially_stageable():
item = s.modified[0] if s.modified else None
if item in model.submodules:
path = core.abspath(item)
action = qtutils.add_action_with_icon(
menu,
icons.add(),
cmds.Stage.name(),
cmds.run(cmds.Stage, context, s.modified),
hotkeys.STAGE_SELECTION,
)
add_action(action)
stage_action_added = self._add_stage_or_unstage_action(
menu, add_action, stage_action_added
)
action = qtutils.add_action_with_icon(
menu,
icons.cola(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo, context, path),
)
add_action(action)
elif item and item not in model.unstaged_deleted:
if self.has_selection():
apply_text = N_('Stage Selected Lines')
edit_and_apply_text = N_('Edit Selected Lines to Stage...')
revert_text = N_('Revert Selected Lines...')
edit_and_revert_text = N_('Edit Selected Lines to Revert...')
else:
apply_text = N_('Stage Diff Hunk')
edit_and_apply_text = N_('Edit Diff Hunk to Stage...')
revert_text = N_('Revert Diff Hunk...')
edit_and_revert_text = N_('Edit Diff Hunk to Revert...')
self.action_apply_selection.setText(apply_text)
self.action_apply_selection.setIcon(icons.add())
add_action(self.action_apply_selection)
self.action_revert_selection.setText(revert_text)
add_action(self.action_revert_selection)
stage_action_added = self._add_stage_or_unstage_action(
menu, add_action, stage_action_added
)
add_action(self.action_revert_unstaged_edits)
# Do not show the "edit" action when the file does not exist.
add_action(qtutils.menu_separator(menu))
if filename and core.exists(filename):
add_action(self.launch_editor)
# Removed files can still be diffed.
add_action(self.launch_difftool)
edit_actions_added = True
add_action(qtutils.menu_separator(menu))
self.action_edit_and_apply_selection.setText(edit_and_apply_text)
self.action_edit_and_apply_selection.setIcon(icons.add())
add_action(self.action_edit_and_apply_selection)
self.action_edit_and_revert_selection.setText(edit_and_revert_text)
add_action(self.action_edit_and_revert_selection)
if s.staged and model.is_unstageable():
item = s.staged[0]
if item in model.submodules:
path = core.abspath(item)
action = qtutils.add_action_with_icon(
menu,
icons.remove(),
cmds.Unstage.name(),
cmds.run(cmds.Unstage, context, s.staged),
hotkeys.STAGE_SELECTION,
)
add_action(action)
stage_action_added = self._add_stage_or_unstage_action(
menu, add_action, stage_action_added
)
qtutils.add_action_with_icon(
menu,
icons.cola(),
N_('Launch git-cola'),
cmds.run(cmds.OpenRepo, context, path),
)
add_action(action)
elif item not in model.staged_deleted:
# Do not show the "edit" action when the file does not exist.
add_action(qtutils.menu_separator(menu))
if filename and core.exists(filename):
add_action(self.launch_editor)
# Removed files can still be diffed.
add_action(self.launch_difftool)
add_action(qtutils.menu_separator(menu))
edit_actions_added = True
if self.has_selection():
edit_and_apply_text = N_('Edit Selected Lines to Unstage...')
else:
edit_and_apply_text = N_('Edit Diff Hunk to Unstage...')
self.action_edit_and_apply_selection.setText(edit_and_apply_text)
self.action_edit_and_apply_selection.setIcon(icons.remove())
add_action(self.action_edit_and_apply_selection)
if not edit_actions_added and (model.is_stageable() or model.is_unstageable()):
add_action(qtutils.menu_separator(menu))
# Do not show the "edit" action when the file does not exist.
# Untracked files exist by definition.
if filename and core.exists(filename):
add_action(self.launch_editor)
# Removed files can still be diffed.
add_action(self.launch_difftool)
add_action(qtutils.menu_separator(menu))
_add_patch_actions(self, self.context, menu)
# Add the Previous/Next File actions, which improves discoverability
# of their associated shortcuts
add_action(qtutils.menu_separator(menu))
add_action(self.move_up)
add_action(self.move_down)
add_action(qtutils.menu_separator(menu))
if current_actions:
first_action = current_actions[0]
else:
first_action = None
menu.insertActions(first_action, menu_actions)
return menu
def _add_stage_or_unstage_action(self, menu, add_action, already_added):
"""Add the Stage / Unstage menu action"""
if already_added:
return True
model = self.context.model
s = self.selection_model.selection()
if model.is_stageable() or model.is_unstageable():
if (model.is_amend_mode() and s.staged) or not self.model.is_stageable():
self.stage_or_unstage.setText(N_('Unstage'))
self.stage_or_unstage.setIcon(icons.remove())
else:
self.stage_or_unstage.setText(N_('Stage'))
self.stage_or_unstage.setIcon(icons.add())
add_action(qtutils.menu_separator(menu))
add_action(self.stage_or_unstage)
return True
def mousePressEvent(self, event):
if event.button() == Qt.RightButton:
# Intercept right-click to move the cursor to the current position.
# setTextCursor() clears the selection so this is only done when
# nothing is selected.
if not self.has_selection():
cursor = self.cursorForPosition(event.pos())
self.setTextCursor(cursor)
return super().mousePressEvent(event)
def setPlainText(self, text):
"""setPlainText(str) while retaining scrollbar positions"""
model = self.model
mode = model.mode
highlight = mode not in (
model.mode_none,
model.mode_display,
model.mode_untracked,
)
self.highlighter.set_enabled(highlight)
scrollbar = self.verticalScrollBar()
if scrollbar:
scrollvalue = get(scrollbar)
else:
scrollvalue = None
if text is None:
return
DiffTextEdit.setPlainText(self, text)
if scrollbar and scrollvalue is not None:
scrollbar.setValue(scrollvalue)
def apply_selection(self, *, edit=False):
model = self.model
s = self.selection_model.single_selection()
if model.is_partially_stageable() and (s.modified or s.untracked):
self.process_diff_selection(edit=edit)
elif model.is_unstageable():
self.process_diff_selection(reverse=True, edit=edit)
def revert_selection(self, *, edit=False):
"""Destructively revert selected lines or hunk from a worktree file."""
if not edit:
if self.has_selection():
title = N_('Revert Selected Lines?')
ok_text = N_('Revert Selected Lines')
else:
title = N_('Revert Diff Hunk?')
ok_text = N_('Revert Diff Hunk')
if not Interaction.confirm(
title,
N_(
'This operation drops uncommitted changes.\n'
'These changes cannot be recovered.'
),
N_('Revert the uncommitted changes?'),
ok_text,
default=True,
icon=icons.undo(),
):
return
self.process_diff_selection(reverse=True, apply_to_worktree=True, edit=edit)
def extract_patch(self, reverse=False):
first_line_idx, last_line_idx = self.selected_lines()
patch = diffparse.Patch.parse(self.model.filename, self.model.diff_text)
if self.has_selection():
return patch.extract_subset(first_line_idx, last_line_idx, reverse=reverse)
return patch.extract_hunk(first_line_idx, reverse=reverse)
def patch_encoding(self):
if isinstance(self.model.diff_text, core.UStr):
# original encoding must prevail
return self.model.diff_text.encoding
return self.context.cfg.file_encoding(self.model.filename)
def process_diff_selection(
self, reverse=False, apply_to_worktree=False, edit=False
):
"""Implement un/staging of the selected line(s) or hunk."""
if self.selection_model.is_empty():
return
patch = self.extract_patch(reverse)
if not patch.has_changes():
return
patch_encoding = self.patch_encoding()
if edit:
patch = edit_patch(
patch,
patch_encoding,
self.context,
reverse=reverse,
apply_to_worktree=apply_to_worktree,
)
if not patch.has_changes():
return
cmds.do(
cmds.ApplyPatch,
self.context,
patch,
patch_encoding,
apply_to_worktree,
)
def _update_line_number(self):
"""Update the selection model when the cursor changes"""
self.selection_model.line_number = self.numbers.current_line()
def _add_patch_actions(widget, context, menu):
"""Add actions for manipulating patch files"""
patches_menu = menu.addMenu(N_('Patches'))
patches_menu.setIcon(icons.diff())
export_action = qtutils.add_action(
patches_menu,
N_('Export Patch'),
lambda: _export_patch(widget, context),
)
export_action.setIcon(icons.save())
patches_menu.addAction(export_action)
# Build the "Append Patch" menu dynamically.
append_menu = patches_menu.addMenu(N_('Append Patch'))
append_menu.setIcon(icons.add())
append_menu.aboutToShow.connect(
lambda: _build_patch_append_menu(widget, context, append_menu)
)
def _build_patch_append_menu(widget, context, menu):
"""Build the "Append Patch" sub-menu"""
# Build the menu when first displayed only. This initial check avoids
# re-populating the menu with duplicate actions.
menu_actions = menu.actions()
if menu_actions:
return
choose_patch_action = qtutils.add_action(
menu,
N_('Choose Patch...'),
lambda: _export_patch(widget, context, append=True),
)
choose_patch_action.setIcon(icons.diff())
menu.addAction(choose_patch_action)
subdir_menus = {}
path = prefs.patches_directory(context)
patches = get_patches_from_dir(path)
for patch in patches:
relpath = os.path.relpath(patch, start=path)
sub_menu = _add_patch_subdirs(menu, subdir_menus, relpath)
patch_basename = os.path.basename(relpath)
append_action = qtutils.add_action(
sub_menu,
patch_basename,
lambda patch_file=patch: _append_patch(widget, patch_file),
)
append_action.setIcon(icons.save())
sub_menu.addAction(append_action)
def _add_patch_subdirs(menu, subdir_menus, relpath):
"""Build menu leading up to the patch"""
# If the path contains no directory separators then add it to the
# root of the menu.
if os.sep not in relpath:
return menu
# Loop over each directory component and build a menu if it doesn't already exist.
components = []
for dirname in os.path.dirname(relpath).split(os.sep):
components.append(dirname)
current_dir = os.sep.join(components)
try:
menu = subdir_menus[current_dir]
except KeyError:
menu = subdir_menus[current_dir] = menu.addMenu(dirname)
menu.setIcon(icons.folder())
return menu
def _export_patch(diff_editor, context, append=False):
"""Export the selected diff to a patch file"""
if diff_editor.selection_model.is_empty():
return
patch = diff_editor.extract_patch(reverse=False)
if not patch.has_changes():
return
directory = prefs.patches_directory(context)
if append:
filename = qtutils.existing_file(directory, title=N_('Append Patch...'))
else:
default_filename = os.path.join(directory, 'diff.patch')
filename = qtutils.save_as(default_filename)
if not filename:
return
_write_patch_to_file(diff_editor, patch, filename, append=append)
def _append_patch(diff_editor, filename):
"""Append diffs to the specified patch file"""
if diff_editor.selection_model.is_empty():
return
patch = diff_editor.extract_patch(reverse=False)
if not patch.has_changes():
return
_write_patch_to_file(diff_editor, patch, filename, append=True)
def _write_patch_to_file(diff_editor, patch, filename, append=False):
"""Write diffs from the Diff Editor to the specified patch file"""
encoding = diff_editor.patch_encoding()
content = patch.as_text()
try:
core.write(filename, content, encoding=encoding, append=append)
except OSError as exc:
_, details = utils.format_exception(exc)
title = N_('Error writing patch')
msg = N_('Unable to write patch to "%s". Check permissions?' % filename)
Interaction.critical(title, message=msg, details=details)
return
Interaction.log('Patch written to "%s"' % filename)
class ObjectIdLabel(PlainTextLabel):
"""Interactive object IDs"""
def __init__(self, context, oid='', parent=None):
super().__init__(copy_on_click=True, parent=parent)
self.context = context
self.oid = oid
self.setToolTip(N_('Click to Copy'))
self._copy_short_action = qtutils.add_action_with_icon(
self,
icons.copy(),
N_('Copy Commit (Short)'),
self._copy_short,
hotkeys.COPY,
)
self._copy_long_action = qtutils.add_action_with_icon(
self,
icons.copy(),
N_('Copy Commit'),
self._copy_long,
hotkeys.COPY_COMMIT_ID,
)
self.timer = label_selection_timer(self)
def set_oid(self, oid):
"""Record the object ID and update the display"""
self.oid = oid
self.set_text(oid)
def _copy_short(self, clicked=False):
"""Copy the abbreviated commit ID"""
abbrev = prefs.abbrev(self.context)
qtutils.set_clipboard(self.oid[:abbrev])
self.start_selection_timer()
def _copy_long(self):
"""Copy the full commit ID"""
qtutils.set_clipboard(self.oid)
self.start_selection_timer()
def copy_all_callback(self):
self._copy_short(clicked=True)
def context_menu_actions(self, menu):
"""Display a custom context menu"""
self.copy_selection_action.setEnabled(bool(self.selectedText()))
menu.addAction(self._copy_long_action)
menu.addAction(self._copy_short_action)
menu.addAction(self.copy_selection_action)
menu.addSeparator()
menu.addAction(self.select_all_action)
class AuthorLabel(PlainTextLabel):
"""Custom actions for the author label"""
def __init__(self, parent=None):
super().__init__(parent=parent)
self._author = ''
self._email = ''
self._copy_name_action = qtutils.add_action_with_icon(
self,
icons.copy(),
N_('Copy Name'),
self._copy_name,
)
self._copy_email_action = qtutils.add_action_with_icon(
self,
icons.copy(),
N_('Copy Email'),
self._copy_email,
)
self._send_email_action = qtutils.add_action(
self,
N_('Send Email'),
self._send_email,
)
def set_author(self, author, email):
"""Set the author and email for the label"""
self._author = author
self._email = email
def _copy_email(self):
"""Copy the author's email address"""
qtutils.set_clipboard(self._email)
self.start_selection_timer()
def _copy_name(self):
"""Copy the author's name"""
qtutils.set_clipboard(self._author)
self.start_selection_timer()
def _send_email(self):
url = QtCore.QUrl(f'mailto:{self._author} <{self._email}>')
QtGui.QDesktopServices.openUrl(url)
self.start_selection_timer()
def context_menu_actions(self, menu):
menu.addAction(self._send_email_action)
menu.addSeparator()
menu.addAction(self._copy_name_action)
menu.addAction(self._copy_email_action)
menu.addSeparator()
super().context_menu_actions(menu)
class CommitDiffWidget(QtWidgets.QWidget):
"""Display commit metadata and text diffs"""
def __init__(self, context, parent, is_commit=False, options=None):
QtWidgets.QWidget.__init__(self, parent)
self.context = context
self.oid = 'HEAD'
self.oid_start = None
self.oid_end = None
self.options = options
author_font = QtGui.QFont(self.font())
author_font.setPointSize(int(author_font.pointSize() * 1.1))
summary_font = QtGui.QFont(author_font)
summary_font.setWeight(QtGui.QFont.Bold)
self.gravatar_label = gravatar.GravatarLabel(self.context, parent=self)
self.oid_label = ObjectIdLabel(context, parent=self).align_bottom().elide()
self.author_label = (
AuthorLabel(parent=self).set_font(author_font).align_top().elide()
)
self.date_label = PlainTextLabel(parent=self).align_top().elide()
self.summary_label = (
PlainTextLabel(parent=self).set_font(summary_font).align_top().elide()
)
self.diff = DiffTextEdit(context, self, is_commit=is_commit, whitespace=False)
self.setFocusProxy(self.diff)
self.info_layout = qtutils.vbox(
defs.no_margin,
defs.no_spacing,
self.oid_label,
self.author_label,
self.date_label,
self.summary_label,
)
self.logo_layout = qtutils.hbox(
defs.no_margin, defs.button_spacing, self.gravatar_label, self.info_layout
)
self.logo_layout.setContentsMargins(defs.margin, 0, defs.margin, 0)
self.main_layout = qtutils.vbox(
defs.no_margin, defs.spacing, self.logo_layout, self.diff
)
self.setLayout(self.main_layout)
self.set_tabwidth(prefs.tabwidth(context))
def set_tabwidth(self, width):
self.diff.set_tabwidth(width)
def set_word_wrapping(self, enabled, update=False):
"""Enable and disable word wrapping"""
self.diff.set_word_wrapping(enabled, update=update)
def set_options(self, options):
"""Register an options widget"""
self.options = options
self.diff.set_options(options)
def start_diff_task(self, task):
"""Clear the display and start a diff-gathering task"""
self.diff.save_scrollbar()
cmds.do(cmds.DiffLoading, self.context)
self.context.runtask.start(task, result=self.set_diff)
def set_diff_oid(self, oid, filename=None):
"""Set the diff from a single commit object ID"""
task = DiffInfoTask(self.context, oid, filename)
self.start_diff_task(task)
def set_diff_range(self, start, end, filename=None):
task = DiffRangeTask(self.context, start + '~', end, filename)
self.start_diff_task(task)
def commits_selected(self, commits):
"""Display an appropriate diff when commits are selected"""
if not commits:
self.clear()
return
commit = commits[-1]
oid = commit.oid
author = commit.author or ''
email = commit.email or ''
date = commit.authdate or ''
summary = commit.summary or ''
self.set_details(oid, author, email, date, summary)
self.oid = oid
if len(commits) > 1:
start, end = commits[0], commits[-1]
self.set_diff_range(start.oid, end.oid)
self.oid_start = start
self.oid_end = end
else:
self.set_diff_oid(oid)
self.oid_start = None
self.oid_end = None
def set_diff(self, diff):
"""Set the diff text"""
self.diff.set_diff(diff)
def set_details(self, oid, author, email, date, summary):
template_args = {'author': author, 'email': email}
author_text = '%(author)s <%(email)s>' % template_args
self.date_label.set_text(date)
self.date_label.setVisible(bool(date))
self.oid_label.set_oid(oid)
self.author_label.set_author(author, email)
self.author_label.set_text(author_text)
self.summary_label.set_text(summary)
self.gravatar_label.set_email(email)
def clear(self):
self.date_label.set_text('')
self.oid_label.set_oid('')
self.author_label.set_text('')
self.summary_label.set_text('')
self.gravatar_label.clear()
self.diff.clear()
def files_selected(self, filenames):
"""Update the view when a filename is selected"""
oid_start = self.oid_start
oid_end = self.oid_end
extra_args = {}
if filenames:
extra_args['filename'] = filenames[0]
if oid_start and oid_end:
self.set_diff_range(oid_start.oid, oid_end.oid, **extra_args)
else:
self.set_diff_oid(self.oid, **extra_args)
class DiffPanel(QtWidgets.QWidget):
"""A combined diff + search panel"""
def __init__(self, diff_widget, text_widget, parent):
super().__init__(parent)
self.diff_widget = diff_widget
self.search_widget = TextSearchWidget(text_widget, self)
self.search_widget.hide()
layout = qtutils.vbox(
defs.no_margin, defs.spacing, self.diff_widget, self.search_widget
)
self.setLayout(layout)
self.setFocusProxy(self.diff_widget)
self.search_action = qtutils.add_action(
self,
N_('Search in Diff'),
self.show_search,
hotkeys.SEARCH,
)
def show_search(self):
"""Show a dialog for searching diffs"""
# The diff search is only active in text mode.
if not self.search_widget.isVisible():
self.search_widget.show()
self.search_widget.setFocus()
class DiffInfoTask(qtutils.Task):
"""Gather diffs for a single commit"""
def __init__(self, context, oid, filename):
qtutils.Task.__init__(self)
self.context = context
self.oid = oid
self.filename = filename
def task(self):
context = self.context
oid = self.oid
return gitcmds.diff_info(context, oid, filename=self.filename)
class DiffRangeTask(qtutils.Task):
"""Gather diffs for a range of commits"""
def __init__(self, context, start, end, filename):
qtutils.Task.__init__(self)
self.context = context
self.start = start
self.end = end
self.filename = filename
def task(self):
context = self.context
return gitcmds.diff_range(context, self.start, self.end, filename=self.filename)
def apply_patches(context, patches=None):
"""Open the ApplyPatches dialog"""
parent = qtutils.active_window()
dlg = new_apply_patches(context, patches=patches, parent=parent)
dlg.show()
dlg.raise_()
return dlg
def new_apply_patches(context, patches=None, parent=None):
"""Create a new instances of the ApplyPatches dialog"""
dlg = ApplyPatches(context, parent=parent)
if patches:
dlg.add_paths(patches)
return dlg
def get_patches_from_paths(paths):
"""Returns all patches beneath a given path"""
paths = [core.decode(p) for p in paths]
patches = [p for p in paths if core.isfile(p) and p.endswith(('.patch', '.mbox'))]
dirs = [p for p in paths if core.isdir(p)]
dirs.sort()
for d in dirs:
patches.extend(get_patches_from_dir(d))
return patches
def get_patches_from_mimedata(mimedata):
"""Extract path files from a QMimeData payload"""
urls = mimedata.urls()
if not urls:
return []
paths = [x.path() for x in urls]
return get_patches_from_paths(paths)
def get_patches_from_dir(path):
"""Find patches in a subdirectory"""
patches = []
for root, _, files in core.walk(path):
for name in [f for f in files if f.endswith(('.patch', '.mbox'))]:
patches.append(core.decode(os.path.join(root, name)))
return patches
class ApplyPatches(standard.Dialog):
def __init__(self, context, parent=None):
super().__init__(parent=parent)
self.context = context
self.setWindowTitle(N_('Apply Patches'))
self.setAcceptDrops(True)
if parent is not None:
self.setWindowModality(Qt.WindowModal)
self.curdir = core.getcwd()
self.inner_drag = False
self.usage = QtWidgets.QLabel()
self.usage.setText(
N_(
"""
<p>
Drag and drop or use the <strong>Add</strong> button to add
patches to the list
</p>
"""
)
)
self.tree = PatchTreeWidget(parent=self)
self.tree.setHeaderHidden(True)
self.tree.itemSelectionChanged.connect(self._tree_selection_changed)
self.diffwidget = CommitDiffWidget(context, self, is_commit=True)
self.add_button = qtutils.create_toolbutton(
text=N_('Add'), icon=icons.add(), tooltip=N_('Add patches (+)')
)
self.remove_button = qtutils.create_toolbutton(
text=N_('Remove'),
icon=icons.remove(),
tooltip=N_('Remove selected (Delete)'),
)
self.apply_button = qtutils.create_button(text=N_('Apply'), icon=icons.ok())
self.close_button = qtutils.close_button()
self.add_action = qtutils.add_action(
self, N_('Add'), self.add_files, hotkeys.ADD_ITEM
)
self.remove_action = qtutils.add_action(
self,
N_('Remove'),
self.tree.remove_selected,
hotkeys.DELETE,
hotkeys.BACKSPACE,
hotkeys.REMOVE_ITEM,
)
self.top_layout = qtutils.hbox(
defs.no_margin,
defs.button_spacing,
self.add_button,
self.remove_button,
qtutils.STRETCH,
self.usage,
)
self.bottom_layout = qtutils.hbox(
defs.no_margin,
defs.button_spacing,
qtutils.STRETCH,
self.close_button,
self.apply_button,
)
self.splitter = qtutils.splitter(Qt.Vertical, self.tree, self.diffwidget)
self.main_layout = qtutils.vbox(
defs.margin,
defs.spacing,
self.top_layout,
self.splitter,
self.bottom_layout,
)
self.setLayout(self.main_layout)
qtutils.connect_button(self.add_button, self.add_files)
qtutils.connect_button(self.remove_button, self.tree.remove_selected)
qtutils.connect_button(self.apply_button, self.apply_patches)
qtutils.connect_button(self.close_button, self.close)
self.init_state(None, self.resize, 720, 480)
def apply_patches(self):
items = self.tree.items()
if not items:
return
context = self.context
patches = [i.data(0, Qt.UserRole) for i in items]
cmds.do(cmds.ApplyPatches, context, patches)
self.accept()
def add_files(self):
files = qtutils.open_files(
N_('Select patch file(s)...'),
directory=self.curdir,
filters='Patches (*.patch *.mbox)',
)
if not files:
return
self.curdir = os.path.dirname(files[0])
self.add_paths([core.relpath(f) for f in files])
def dragEnterEvent(self, event):
"""Accepts drops if the mimedata contains patches"""
super().dragEnterEvent(event)
patches = get_patches_from_mimedata(event.mimeData())
if patches:
event.acceptProposedAction()
def dropEvent(self, event):
"""Add dropped patches"""
event.accept()
patches = get_patches_from_mimedata(event.mimeData())
if not patches:
return
self.add_paths(patches)
def add_paths(self, paths):
self.tree.add_paths(paths)
def _tree_selection_changed(self):
items = self.tree.selected_items()
if not items:
return
item = items[-1] # take the last item
path = item.data(0, Qt.UserRole)
if not core.exists(path):
return
commit = parse_patch(path)
self.diffwidget.set_details(
commit.oid, commit.author, commit.email, commit.date, commit.summary
)
self.diffwidget.set_diff(commit.diff)
def export_state(self):
"""Export persistent settings"""
state = super().export_state()
state['sizes'] = get(self.splitter)
return state
def apply_state(self, state):
"""Apply persistent settings"""
result = super().apply_state(state)
try:
self.splitter.setSizes(state['sizes'])
except (AttributeError, KeyError, ValueError, TypeError):
pass
return result
class PatchTreeWidget(standard.DraggableTreeWidget):
def add_paths(self, paths):
patches = get_patches_from_paths(paths)
if not patches:
return
items = []
icon = icons.file_text()
for patch in patches:
item = QtWidgets.QTreeWidgetItem()
flags = item.flags() & ~Qt.ItemIsDropEnabled
item.setFlags(flags)
item.setIcon(0, icon)
item.setText(0, os.path.basename(patch))
item.setData(0, Qt.UserRole, patch)
item.setToolTip(0, patch)
items.append(item)
self.addTopLevelItems(items)
def remove_selected(self):
idxs = self.selectedIndexes()
rows = [idx.row() for idx in idxs]
for row in reversed(sorted(rows)):
self.invisibleRootItem().takeChild(row)
class Commit:
"""Container for commit details"""
def __init__(self):
self.content = ''
self.author = ''
self.email = ''
self.oid = ''
self.summary = ''
self.diff = ''
self.date = ''
def parse_patch(path):
content = core.read(path)
commit = Commit()
parse(content, commit)
return commit
def parse(content, commit):
"""Parse commit details from a patch"""
from_rgx = re.compile(r'^From (?P<oid>[a-f0-9]{40}) .*$')
author_rgx = re.compile(r'^From: (?P<author>[^<]+) <(?P<email>[^>]+)>$')
date_rgx = re.compile(r'^Date: (?P<date>.*)$')
subject_rgx = re.compile(r'^Subject: (?P<summary>.*)$')
commit.content = content
lines = content.splitlines()
for idx, line in enumerate(lines):
match = from_rgx.match(line)
if match:
commit.oid = match.group('oid')
continue
match = author_rgx.match(line)
if match:
commit.author = match.group('author')
commit.email = match.group('email')
continue
match = date_rgx.match(line)
if match:
commit.date = match.group('date')
continue
match = subject_rgx.match(line)
if match:
commit.summary = match.group('summary')
commit.diff = '\n'.join(lines[idx + 1 :])
break
|