-2

src/__phutil_library_map__.php

reviewed

··· 607 607 'DiffusionGitBranch' => 'applications/diffusion/data/DiffusionGitBranch.php', 608 608 'DiffusionGitBranchTestCase' => 'applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php', 609 609 'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php', 610 610 - 'DiffusionGitFileContentQueryTestCase' => 'applications/diffusion/query/__tests__/DiffusionGitFileContentQueryTestCase.php', 611 610 'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php', 612 611 'DiffusionGitReceivePackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php', 613 612 'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php', ··· 4577 4576 'DiffusionGitBranch' => 'Phobject', 4578 4577 'DiffusionGitBranchTestCase' => 'PhabricatorTestCase', 4579 4578 'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery', 4580 4580 - 'DiffusionGitFileContentQueryTestCase' => 'PhabricatorTestCase', 4581 4579 'DiffusionGitRawDiffQuery' => 'DiffusionRawDiffQuery', 4582 4580 'DiffusionGitReceivePackSSHWorkflow' => 'DiffusionGitSSHWorkflow', 4583 4581 'DiffusionGitRequest' => 'DiffusionRequest',

+4 -2

src/applications/diffusion/DiffusionLintSaveRunner.php

reviewed

··· 257 257 'path' => $path, 258 258 'commit' => $this->lintCommit, 259 259 )); 260 260 - $query = DiffusionFileContentQuery::newFromDiffusionRequest($drequest) 261 261 - ->setNeedsBlame(true); 260 260 + 261 261 + // TODO: Restore blame information / generally fix this workflow. 262 262 + 263 263 + $query = DiffusionFileContentQuery::newFromDiffusionRequest($drequest); 262 264 $queries[$path] = $query; 263 265 $futures[$path] = $query->getFileContentFuture(); 264 266 }

+4 -12

src/applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php

reviewed

··· 19 19 return array( 20 20 'path' => 'required string', 21 21 'commit' => 'required string', 22 22 - 'needsBlame' => 'optional bool', 23 22 'timeout' => 'optional int', 24 23 'byteLimit' => 'optional int', 25 24 ); ··· 27 26 28 27 protected function getResult(ConduitAPIRequest $request) { 29 28 $drequest = $this->getDiffusionRequest(); 30 30 - $needs_blame = $request->getValue('needsBlame'); 31 31 - $file_query = DiffusionFileContentQuery::newFromDiffusionRequest( 32 32 - $drequest); 33 33 - $file_query 34 34 - ->setViewer($request->getUser()) 35 35 - ->setNeedsBlame($needs_blame); 29 29 + 30 30 + $file_query = DiffusionFileContentQuery::newFromDiffusionRequest($drequest) 31 31 + ->setViewer($request->getUser()); 36 32 37 33 $timeout = $request->getValue('timeout'); 38 34 if ($timeout) { ··· 46 42 47 43 $file_content = $file_query->loadFileContent(); 48 44 49 49 - if ($needs_blame) { 50 50 - list($text_list, $rev_list, $blame_dict) = $file_query->getBlameData(); 51 51 - } else { 52 52 - $text_list = $rev_list = $blame_dict = array(); 53 53 - } 45 45 + $text_list = $rev_list = $blame_dict = array(); 54 46 55 47 $file_content 56 48 ->setBlameDict($blame_dict)

+130 -74

src/applications/diffusion/controller/DiffusionBrowseController.php

reviewed

··· 130 130 $params = array( 131 131 'commit' => $drequest->getCommit(), 132 132 'path' => $drequest->getPath(), 133 133 - 'needsBlame' => $needs_blame, 134 133 ); 135 134 136 135 $byte_limit = null; ··· 572 571 $path, 573 572 $data) { 574 573 574 574 + $viewer = $this->getViewer(); 575 575 + 576 576 + $blame_handles = array(); 577 577 + if ($needs_blame) { 578 578 + $blame = $this->loadBlame($path, $drequest->getCommit()); 579 579 + if ($blame) { 580 580 + $author_phids = mpull($blame, 'getAuthorPHID'); 581 581 + $blame_handles = $viewer->loadHandles($author_phids); 582 582 + } 583 583 + } else { 584 584 + $blame = array(); 585 585 + } 586 586 + 587 587 + $file_corpus = $file_content->getCorpus(); 588 588 + 575 589 if (!$show_color) { 590 590 + $lines = phutil_split_lines($file_corpus); 591 591 + 576 592 $style = 577 593 'border: none; width: 100%; height: 80em; font-family: monospace'; 578 594 if (!$show_blame) { ··· 581 597 array( 582 598 'style' => $style, 583 599 ), 584 584 - $file_content->getCorpus()); 600 600 + $file_corpus); 585 601 } else { 586 586 - $text_list = $file_content->getTextList(); 587 587 - $rev_list = $file_content->getRevList(); 588 588 - $blame_dict = $file_content->getBlameDict(); 589 589 - 590 602 $rows = array(); 591 591 - foreach ($text_list as $k => $line) { 592 592 - $rev = $rev_list[$k]; 593 593 - $author = $blame_dict[$rev]['author']; 594 594 - $rows[] = 595 595 - sprintf('%-10s %-20s %s', substr($rev, 0, 7), $author, $line); 603 603 + foreach ($lines as $line_number => $line) { 604 604 + $commit = idx($blame, $line_number); 605 605 + if ($commit) { 606 606 + $author = $commit->renderAuthorShortName($blame_handles); 607 607 + $commit_name = $commit->getShortName(); 608 608 + } else { 609 609 + $author = null; 610 610 + $commit_name = null; 611 611 + } 612 612 + 613 613 + $rows[] = sprintf( 614 614 + '%-10s %-20s %s', 615 615 + $commit_name, 616 616 + $author, 617 617 + $line); 596 618 } 597 619 598 620 $corpus = phutil_tag( ··· 600 622 array( 601 623 'style' => $style, 602 624 ), 603 603 - implode("\n", $rows)); 625 625 + implode('', $rows)); 604 626 } 605 627 } else { 606 628 require_celerity_resource('syntax-highlighting-css'); 607 607 - $text_list = $file_content->getTextList(); 608 608 - $rev_list = $file_content->getRevList(); 609 609 - $blame_dict = $file_content->getBlameDict(); 610 629 611 611 - $text_list = implode("\n", $text_list); 612 612 - $text_list = PhabricatorSyntaxHighlighter::highlightWithFilename( 630 630 + $highlighted = PhabricatorSyntaxHighlighter::highlightWithFilename( 613 631 $path, 614 614 - $text_list); 615 615 - $text_list = explode("\n", $text_list); 632 632 + $file_corpus); 633 633 + $lines = phutil_split_lines($highlighted); 616 634 617 617 - $rows = $this->buildDisplayRows($text_list, $rev_list, $blame_dict, 618 618 - $needs_blame, $drequest, $show_blame, $show_color); 635 635 + $rows = $this->buildDisplayRows( 636 636 + $lines, 637 637 + $blame, 638 638 + $show_blame, 639 639 + $show_color); 619 640 620 641 $corpus_table = javelin_tag( 621 642 'table', ··· 824 845 825 846 826 847 private function buildDisplayRows( 827 827 - array $text_list, 828 828 - array $rev_list, 829 829 - array $blame_dict, 830 830 - $needs_blame, 831 831 - DiffusionRequest $drequest, 832 832 - $show_blame, 833 833 - $show_color) { 848 848 + array $lines, 849 849 + array $blame, 850 850 + $show_color, 851 851 + $show_blame) { 852 852 + 853 853 + $drequest = $this->getDiffusionRequest(); 834 854 835 855 $handles = array(); 836 836 - if ($blame_dict) { 837 837 - $epoch_list = ipull(ifilter($blame_dict, 'epoch'), 'epoch'); 856 856 + if ($blame) { 857 857 + $epoch_list = mpull($blame, 'getEpoch', 'getID'); 858 858 + $epoch_list = array_filter($epoch_list); 859 859 + $epoch_list = array_unique($epoch_list); 860 860 + $epoch_list = array_values($epoch_list); 861 861 + 838 862 $epoch_min = min($epoch_list); 839 863 $epoch_max = max($epoch_list); 840 864 $epoch_range = ($epoch_max - $epoch_min) + 1; 865 865 + } 841 866 842 842 - $author_phids = ipull(ifilter($blame_dict, 'authorPHID'), 'authorPHID'); 843 843 - $handles = $this->loadViewerHandles($author_phids); 844 844 - } 845 867 846 868 $line_arr = array(); 847 869 $line_str = $drequest->getLine(); ··· 864 886 $display = array(); 865 887 866 888 $line_number = 1; 867 867 - $last_rev = null; 889 889 + $last_commit = null; 868 890 $color = null; 869 869 - foreach ($text_list as $k => $line) { 891 891 + foreach ($lines as $line_index => $line) { 870 892 $display_line = array( 871 893 'epoch' => null, 872 894 'commit' => null, ··· 882 904 // with same color; otherwise generate blame info. The newer a change 883 905 // is, the more saturated the color. 884 906 885 885 - $rev = idx($rev_list, $k, $last_rev); 907 907 + $commit = idx($blame, $line_index, $last_commit); 886 908 887 887 - if ($last_rev == $rev) { 909 909 + if ($commit && $last_commit && 910 910 + ($last_commit->getID() == $commit->getID())) { 888 911 $display_line['color'] = $color; 889 912 } else { 890 890 - $blame = $blame_dict[$rev]; 913 913 + if ($commit) { 914 914 + $epoch = $commit->getEpoch(); 915 915 + } else { 916 916 + $epoch = null; 917 917 + } 891 918 892 892 - if (!isset($blame['epoch'])) { 893 893 - $color = '#ffd'; // Render as warning. 919 919 + if (!$epoch) { 920 920 + if (!$blame) { 921 921 + $color = '#f6f6f6'; 922 922 + } else { 923 923 + $color = '#ffd'; // Render as warning. 924 924 + } 894 925 } else { 895 895 - $color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range; 926 926 + $color_ratio = ($epoch - $epoch_min) / $epoch_range; 896 927 $color_value = 0xE6 * (1.0 - $color_ratio); 897 928 $color = sprintf( 898 929 '#%02x%02x%02x', ··· 901 932 $color_value); 902 933 } 903 934 904 904 - $display_line['epoch'] = idx($blame, 'epoch'); 935 935 + $display_line['epoch'] = $epoch; 905 936 $display_line['color'] = $color; 906 906 - $display_line['commit'] = $rev; 907 937 908 908 - $author_phid = idx($blame, 'authorPHID'); 909 909 - if ($author_phid && $handles[$author_phid]) { 910 910 - $author_link = $handles[$author_phid]->renderLink(); 938 938 + if ($commit) { 939 939 + $display_line['commit'] = $commit; 911 940 } else { 912 912 - $author_link = $blame['author']; 941 941 + $display_line['commit'] = null; 913 942 } 914 914 - $display_line['author'] = $author_link; 915 943 916 916 - $last_rev = $rev; 944 944 + $last_commit = $commit; 917 945 } 918 946 } 919 947 ··· 936 964 $request = $this->getRequest(); 937 965 $viewer = $request->getUser(); 938 966 939 939 - $commits = array_filter(ipull($display, 'commit')); 940 940 - if ($commits) { 941 941 - $commits = id(new DiffusionCommitQuery()) 942 942 - ->setViewer($viewer) 943 943 - ->withRepository($drequest->getRepository()) 944 944 - ->withIdentifiers($commits) 945 945 - ->execute(); 946 946 - $commits = mpull($commits, null, 'getCommitIdentifier'); 947 947 - } 967 967 + $commits = mpull($blame, null, 'getCommitIdentifier'); 948 968 949 969 $revision_ids = id(new DifferentialRevision()) 950 970 ->loadIDsByCommitPHIDs(mpull($commits, 'getPHID')); ··· 957 977 } 958 978 959 979 $phids = array(); 960 960 - foreach ($commits as $commit) { 961 961 - if ($commit->getAuthorPHID()) { 962 962 - $phids[] = $commit->getAuthorPHID(); 980 980 + foreach ($commits as $blame_commit) { 981 981 + if ($blame_commit->getAuthorPHID()) { 982 982 + $phids[] = $blame_commit->getAuthorPHID(); 963 983 } 964 984 } 965 985 foreach ($revisions as $revision) { ··· 1002 1022 $engine); 1003 1023 1004 1024 foreach ($display as $line) { 1005 1005 - 1006 1025 $line_href = $drequest->generateURI( 1007 1026 array( 1008 1027 'action' => 'browse', ··· 1023 1042 if (idx($line, 'commit')) { 1024 1043 $commit = $line['commit']; 1025 1044 1026 1026 - if (idx($commits, $commit)) { 1045 1045 + if ($commit) { 1027 1046 $tooltip = $this->renderCommitTooltip( 1028 1028 - $commits[$commit], 1047 1047 + $commit, 1029 1048 $handles, 1030 1030 - $line['author']); 1049 1049 + $commit->renderAuthorLink($handles)); 1031 1050 } else { 1032 1051 $tooltip = null; 1033 1052 } ··· 1041 1060 'href' => $drequest->generateURI( 1042 1061 array( 1043 1062 'action' => 'commit', 1044 1044 - 'commit' => $line['commit'], 1063 1063 + 'commit' => $commit->getCommitIdentifier(), 1045 1064 )), 1046 1065 'sigil' => 'has-tooltip', 1047 1066 'meta' => array( ··· 1050 1069 'size' => 600, 1051 1070 ), 1052 1071 ), 1053 1053 - id(new PhutilUTF8StringTruncator()) 1054 1054 - ->setMaximumGlyphs(9) 1055 1055 - ->setTerminator('') 1056 1056 - ->truncateString($line['commit'])); 1072 1072 + $commit->getShortName()); 1057 1073 1058 1074 $revision_id = null; 1059 1059 - if (idx($commits, $commit)) { 1060 1060 - $revision_id = idx($revision_ids, $commits[$commit]->getPHID()); 1075 1075 + if ($commit) { 1076 1076 + $revision_id = idx($revision_ids, $commit->getPHID()); 1061 1077 } 1062 1078 1063 1079 if ($revision_id) { ··· 1207 1223 1208 1224 private function renderInlines( 1209 1225 array $inlines, 1210 1210 - $needs_blame, 1226 1226 + $show_blame, 1211 1227 $has_coverage, 1212 1228 $engine) { 1213 1229 ··· 1222 1238 ->setInlineComment($inline) 1223 1239 ->render(); 1224 1240 1225 1225 - $row = array_fill(0, ($needs_blame ? 3 : 1), phutil_tag('th')); 1241 1241 + $row = array_fill(0, ($show_blame ? 3 : 1), phutil_tag('th')); 1226 1242 1227 1243 $row[] = phutil_tag('td', array(), $inline_view); 1228 1244 ··· 1720 1736 $view->setHandles($handles); 1721 1737 1722 1738 return $view; 1739 1739 + } 1740 1740 + 1741 1741 + private function loadBlame($path, $commit) { 1742 1742 + $blame = $this->callConduitWithDiffusionRequest( 1743 1743 + 'diffusion.blame', 1744 1744 + array( 1745 1745 + 'commit' => $commit, 1746 1746 + 'paths' => array($path), 1747 1747 + )); 1748 1748 + 1749 1749 + $identifiers = idx($blame, $path, array()); 1750 1750 + 1751 1751 + if ($identifiers) { 1752 1752 + $viewer = $this->getViewer(); 1753 1753 + $drequest = $this->getDiffusionRequest(); 1754 1754 + $repository = $drequest->getRepository(); 1755 1755 + 1756 1756 + $commits = id(new DiffusionCommitQuery()) 1757 1757 + ->setViewer($viewer) 1758 1758 + ->withRepository($repository) 1759 1759 + ->withIdentifiers($identifiers) 1760 1760 + // TODO: We only fetch this to improve author display behavior, but 1761 1761 + // shouldn't really need to? 1762 1762 + ->needCommitData(true) 1763 1763 + ->execute(); 1764 1764 + $commits = mpull($commits, null, 'getCommitIdentifier'); 1765 1765 + } else { 1766 1766 + $commits = array(); 1767 1767 + } 1768 1768 + 1769 1769 + foreach ($identifiers as $key => $identifier) { 1770 1770 + $commit = idx($commits, $identifier); 1771 1771 + if ($commit) { 1772 1772 + $identifiers[$key] = $commit; 1773 1773 + } else { 1774 1774 + $identifiers[$key] = null; 1775 1775 + } 1776 1776 + } 1777 1777 + 1778 1778 + return $identifiers; 1723 1779 } 1724 1780 1725 1781 }

-32

src/applications/diffusion/query/__tests__/DiffusionGitFileContentQueryTestCase.php

reviewed

··· 1 1 - <?php 2 2 - 3 3 - final class DiffusionGitFileContentQueryTestCase extends PhabricatorTestCase { 4 4 - 5 5 - public function testAuthorName() { 6 6 - // A normal case - no parenthesis in user name 7 7 - $result = DiffusionGitFileContentQuery::match( 8 8 - '8220d5d54f6d5d5552a636576cbe9c35f15b65b2 '. 9 9 - '(Andrew Gallagher 2010-12-03 324) $somevar = $this->call()'); 10 10 - $this->assertEqual($result[0], '8220d5d54f6d5d5552a636576cbe9c35f15b65b2'); 11 11 - $this->assertEqual($result[1], 'Andrew Gallagher'); 12 12 - $this->assertEqual($result[2], ' $somevar = $this->call()'); 13 13 - 14 14 - // User name like 'Jimmy (He) Zhang' 15 15 - $result = DiffusionGitFileContentQuery::match( 16 16 - '8220d5d54f6d5d5552a636576cbe9c35f15b65b2 '. 17 17 - '( Jimmy (He) Zhang 2013-10-11 5) '. 18 18 - 'code(); "(string literal 9999-99-99 2)"; more_code();'); 19 19 - $this->assertEqual($result[1], 'Jimmy (He) Zhang'); 20 20 - $this->assertEqual($result[2], 21 21 - ' code(); "(string literal 9999-99-99 2)"; more_code();'); 22 22 - 23 23 - // User name like 'Scott Shapiro (Ads Product Marketing)' 24 24 - $result = DiffusionGitFileContentQuery::match( 25 25 - '8220d5d54f6d5d5552a636576cbe9c35f15b65b2 '. 26 26 - '( Scott Shapiro (Ads Product Marketing) 2013-10-11 5) '. 27 27 - 'code(); "(string literal 9999-99-99 2)"; more_code();'); 28 28 - $this->assertEqual($result[1], 'Scott Shapiro (Ads Product Marketing)'); 29 29 - $this->assertEqual($result[2], 30 30 - ' code(); "(string literal 9999-99-99 2)"; more_code();'); 31 31 - } 32 32 - }

+9 -107

src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php

reviewed

··· 8 8 */ 9 9 abstract class DiffusionFileContentQuery extends DiffusionQuery { 10 10 11 11 - private $needsBlame; 12 11 private $fileContent; 13 12 private $viewer; 14 13 private $timeout; ··· 30 29 31 30 public function getByteLimit() { 32 31 return $this->byteLimit; 32 32 + } 33 33 + 34 34 + public function setViewer(PhabricatorUser $user) { 35 35 + $this->viewer = $user; 36 36 + return $this; 37 37 + } 38 38 + 39 39 + public function getViewer() { 40 40 + return $this->viewer; 33 41 } 34 42 35 43 final public static function newFromDiffusionRequest( ··· 90 98 return $this->fileContent->getCorpus(); 91 99 } 92 100 93 93 - /** 94 94 - * Pretty hairy function. If getNeedsBlame is false, this returns 95 95 - * 96 96 - * ($text_list, array(), array()) 97 97 - * 98 98 - * Where $text_list is the raw file content with trailing new lines stripped. 99 99 - * 100 100 - * If getNeedsBlame is true, this returns 101 101 - * 102 102 - * ($text_list, $line_rev_dict, $blame_dict) 103 103 - * 104 104 - * Where $text_list is just the lines of code -- the raw file content will 105 105 - * contain lots of blame data, $line_rev_dict is a dictionary of line number 106 106 - * => revision id, and $blame_dict is another complicated data structure. 107 107 - * In detail, $blame_dict contains [revision id][author] keys, as well 108 108 - * as [commit id][authorPhid] and [commit id][epoch] keys. 109 109 - * 110 110 - * @return ($text_list, $line_rev_dict, $blame_dict) 111 111 - */ 112 112 - final public function getBlameData() { 113 113 - $raw_data = preg_replace('/\n$/', '', $this->getRawData()); 114 114 - 115 115 - $text_list = array(); 116 116 - $line_rev_dict = array(); 117 117 - $blame_dict = array(); 118 118 - 119 119 - if (!$this->getNeedsBlame()) { 120 120 - $text_list = explode("\n", $raw_data); 121 121 - } else if ($raw_data != '') { 122 122 - $lines = array(); 123 123 - foreach (explode("\n", $raw_data) as $k => $line) { 124 124 - $lines[$k] = $this->tokenizeLine($line); 125 125 - 126 126 - list($rev_id, $author, $text) = $lines[$k]; 127 127 - $text_list[$k] = $text; 128 128 - $line_rev_dict[$k] = $rev_id; 129 129 - } 130 130 - 131 131 - $line_rev_dict = $this->processRevList($line_rev_dict); 132 132 - 133 133 - foreach ($lines as $k => $line) { 134 134 - list($rev_id, $author, $text) = $line; 135 135 - $rev_id = $line_rev_dict[$k]; 136 136 - 137 137 - if (!isset($blame_dict[$rev_id])) { 138 138 - $blame_dict[$rev_id]['author'] = $author; 139 139 - } 140 140 - } 141 141 - 142 142 - $repository = $this->getRequest()->getRepository(); 143 143 - 144 144 - $commits = id(new DiffusionCommitQuery()) 145 145 - ->setViewer($this->getViewer()) 146 146 - ->withDefaultRepository($repository) 147 147 - ->withIdentifiers(array_unique($line_rev_dict)) 148 148 - ->execute(); 149 149 - 150 150 - foreach ($commits as $commit) { 151 151 - $blame_dict[$commit->getCommitIdentifier()]['epoch'] = 152 152 - $commit->getEpoch(); 153 153 - } 154 154 - 155 155 - if ($commits) { 156 156 - $commits_data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( 157 157 - 'commitID IN (%Ls)', 158 158 - mpull($commits, 'getID')); 159 159 - 160 160 - foreach ($commits_data as $data) { 161 161 - $author_phid = $data->getCommitDetail('authorPHID'); 162 162 - if (!$author_phid) { 163 163 - continue; 164 164 - } 165 165 - $commit = $commits[$data->getCommitID()]; 166 166 - $commit_identifier = $commit->getCommitIdentifier(); 167 167 - $blame_dict[$commit_identifier]['authorPHID'] = $author_phid; 168 168 - } 169 169 - } 170 170 - 171 171 - } 172 172 - 173 173 - return array($text_list, $line_rev_dict, $blame_dict); 174 174 - } 175 175 - 176 176 - abstract protected function tokenizeLine($line); 177 177 - 178 178 - public function setNeedsBlame($needs_blame) { 179 179 - $this->needsBlame = $needs_blame; 180 180 - return $this; 181 181 - } 182 182 - 183 183 - public function getNeedsBlame() { 184 184 - return $this->needsBlame; 185 185 - } 186 186 - 187 187 - public function setViewer(PhabricatorUser $user) { 188 188 - $this->viewer = $user; 189 189 - return $this; 190 190 - } 191 191 - 192 192 - public function getViewer() { 193 193 - return $this->viewer; 194 194 - } 195 195 - 196 196 - protected function processRevList(array $rev_list) { 197 197 - return $rev_list; 198 198 - } 199 101 }

+4 -35

src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php

reviewed

··· 9 9 $path = $drequest->getPath(); 10 10 $commit = $drequest->getCommit(); 11 11 12 12 - if ($this->getNeedsBlame()) { 13 13 - return $repository->getLocalCommandFuture( 14 14 - '--no-pager blame -c -l --date=short %s -- %s', 15 15 - $commit, 16 16 - $path); 17 17 - } else { 18 18 - return $repository->getLocalCommandFuture( 19 19 - 'cat-file blob %s:%s', 20 20 - $commit, 21 21 - $path); 22 22 - } 12 12 + return $repository->getLocalCommandFuture( 13 13 + 'cat-file blob %s:%s', 14 14 + $commit, 15 15 + $path); 23 16 } 24 17 25 18 protected function executeQueryFromFuture(Future $future) { ··· 29 22 $file_content->setCorpus($corpus); 30 23 31 24 return $file_content; 32 32 - } 33 33 - 34 34 - protected function tokenizeLine($line) { 35 35 - return self::match($line); 36 36 - } 37 37 - 38 38 - public static function match($line) { 39 39 - $m = array(); 40 40 - // sample lines: 41 41 - // 42 42 - // d1b4fcdd2a7c8c0f8cbdd01ca839d992135424dc 43 43 - // ( hzhao 2009-05-01 202)function print(); 44 44 - // 45 45 - // 8220d5d54f6d5d5552a636576cbe9c35f15b65b2 46 46 - // (Andrew Gallagher 2010-12-03 324) 47 47 - // // Add the lines for trailing context 48 48 - preg_match( 49 49 - '/^\s*?(\S+?)\s*\(\s*(.*?)\s+\d{4}-\d{2}-\d{2}\s+\d+\)(.*)?$/', 50 50 - $line, 51 51 - $m); 52 52 - $rev_id = $m[1]; 53 53 - $author = $m[2]; 54 54 - $text = idx($m, 3); 55 55 - return array($rev_id, $author, $text); 56 25 } 57 26 58 27 }

+4 -54

src/applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php

reviewed

··· 10 10 $path = $drequest->getPath(); 11 11 $commit = $drequest->getCommit(); 12 12 13 13 - if ($this->getNeedsBlame()) { 14 14 - // NOTE: We're using "--number" instead of "--changeset" because there is 15 15 - // no way to get "--changeset" to show us the full commit hashes. 16 16 - return $repository->getLocalCommandFuture( 17 17 - 'annotate --user --number --rev %s -- %s', 18 18 - $commit, 19 19 - $path); 20 20 - } else { 21 21 - return $repository->getLocalCommandFuture( 22 22 - 'cat --rev %s -- %s', 23 23 - $commit, 24 24 - $path); 25 25 - } 13 13 + return $repository->getLocalCommandFuture( 14 14 + 'cat --rev %s -- %s', 15 15 + $commit, 16 16 + $path); 26 17 } 27 18 28 19 protected function executeQueryFromFuture(Future $future) { ··· 32 23 $file_content->setCorpus($corpus); 33 24 34 25 return $file_content; 35 35 - } 36 36 - 37 37 - protected function tokenizeLine($line) { 38 38 - $matches = null; 39 39 - 40 40 - preg_match( 41 41 - '/^(.*?)\s+([0-9]+): (.*)$/', 42 42 - $line, 43 43 - $matches); 44 44 - 45 45 - return array($matches[2], $matches[1], $matches[3]); 46 46 - } 47 47 - 48 48 - /** 49 49 - * Convert local revision IDs into full commit identifier hashes. 50 50 - */ 51 51 - protected function processRevList(array $rev_list) { 52 52 - $drequest = $this->getRequest(); 53 53 - $repository = $drequest->getRepository(); 54 54 - 55 55 - $revs = array_unique($rev_list); 56 56 - foreach ($revs as $key => $rev) { 57 57 - $revs[$key] = '--rev '.(int)$rev; 58 58 - } 59 59 - 60 60 - list($stdout) = $repository->execxLocalCommand( 61 61 - 'log --template=%s %C', 62 62 - '{rev} {node}\\n', 63 63 - implode(' ', $revs)); 64 64 - 65 65 - $map = array(); 66 66 - foreach (explode("\n", trim($stdout)) as $line) { 67 67 - list($rev, $node) = explode(' ', $line); 68 68 - $map[$rev] = $node; 69 69 - } 70 70 - 71 71 - foreach ($rev_list as $k => $rev) { 72 72 - $rev_list[$k] = $map[$rev]; 73 73 - } 74 74 - 75 75 - return $rev_list; 76 26 } 77 27 78 28 }

+1 -14

src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php

reviewed

··· 10 10 $commit = $drequest->getCommit(); 11 11 12 12 return $repository->getRemoteCommandFuture( 13 13 - '%C %s', 14 14 - $this->getNeedsBlame() ? 'blame --force' : 'cat', 13 13 + 'cat %s', 15 14 $repository->getSubversionPathURI($path, $commit)); 16 15 } 17 16 ··· 39 38 $file_content->setCorpus($corpus); 40 39 41 40 return $file_content; 42 42 - } 43 43 - 44 44 - protected function tokenizeLine($line) { 45 45 - // sample line: 46 46 - // 347498 yliu function print(); 47 47 - $m = array(); 48 48 - preg_match('/^\s*(\d+)\s+(\S+)(?: (.*))?$/', $line, $m); 49 49 - $rev_id = $m[1]; 50 50 - $author = $m[2]; 51 51 - $text = idx($m, 3); 52 52 - 53 53 - return array($rev_id, $author, $text); 54 41 } 55 42 56 43 }

+26

src/applications/repository/storage/PhabricatorRepositoryCommit.php

reviewed

··· 266 266 return $repository->formatCommitName($identifier); 267 267 } 268 268 269 269 + public function getShortName() { 270 270 + $identifier = $this->getCommitIdentifier(); 271 271 + return substr($identifier, 0, 9); 272 272 + } 273 273 + 274 274 + public function renderAuthorLink($handles) { 275 275 + $author_phid = $this->getAuthorPHID(); 276 276 + if ($author_phid && isset($handles[$author_phid])) { 277 277 + return $handles[$author_phid]->renderLink(); 278 278 + } 279 279 + 280 280 + return $this->renderAuthorShortName($handles); 281 281 + } 282 282 + 283 283 + public function renderAuthorShortName($handles) { 284 284 + $author_phid = $this->getAuthorPHID(); 285 285 + if ($author_phid && isset($handles[$author_phid])) { 286 286 + return $handles[$author_phid]->getName(); 287 287 + } 288 288 + 289 289 + $data = $this->getCommitData(); 290 290 + $name = $data->getAuthorName(); 291 291 + 292 292 + $parsed = new PhutilEmailAddress($name); 293 293 + return nonempty($parsed->getDisplayName(), $parsed->getAddress()); 294 294 + } 269 295 270 296 /* -( PhabricatorPolicyInterface )----------------------------------------- */ 271 297