Lines Matching +full:commit +full:- +full:message
20 $this->helper =& plugin_load('helper', 'git');
21 if(!$this->helper) msg('Loading the git helper in the git_localstatus class failed.', -1);
64 $this->Lexer->addSpecialPattern('~~GITRemoteStatus~~',$mode,'plugin_git_remotestatus');
72 $match = substr($match,11,-2); //strip ~~REVISIONS: from start and ~~ from end
73 // Wolfgang 2007-08-29 suggests commenting out the next line
97 … $renderer->doc .= "<br/><br/>You need to be logged in to view this page. Please login.";
103 $this->getConf('');
109 $repo->git_path = $git_exe_path;
110 $repo->fetch();
111 $log = $repo->get_log();
114 … $renderer->doc .= "There are no upstream updates for the current workspace. It's up to date!";
118 $waiting_to_commit = $repo->get_status();
122 …$renderer->doc .= 'Please commit local changes before you can merge upstream. <a href="'.$gitLocal…
126 $commits = $repo->get_commits($log);
129 … $renderer->doc .= "Select a commit from upstream to view the changes contained in each: <br/>";
130 … $this->helper->render_commit_selector($renderer, $commits);
131 … $this->helper->render_changed_files_table($renderer, $commits, $repo);
132 … $this->helper->renderChangesMade($renderer, $repo, 'Merge upstream');
134 $renderer->doc .= '<form method="post">';
135 … $renderer->doc .= ' <input type="submit" name="cmd[ignore]" value="Ignore this commit" />';
136 $renderer->doc .= ' <input type="submit" name="cmd[merge]" value="Merge All" />';
137 $renderer->doc .= '</form>';
138 $renderer->doc .= '<br/>';
143 $renderer->doc .= $e->getMessage();
153 …// $renderer->doc .= "<select id='git_commit' width=\"800\" style=\"width: 800px\" onchange='Ch…
155 // foreach($commits as $commit)
157 …// $renderer->doc .= "<option value=\"".$commit['hash']."\">".$index." - ".$commit['message…
160 // $renderer->doc .= '</select>';
165 // $renderer->doc .= '<h3>This is the content of the selected commit:</h3>';
167 // foreach($commits as $commit)
169 …->doc .= "<div class=\"commit_div\" id='".$commit['hash']."' style=\"".$divVisibility." width: 100…
170 // $hash = $commit['hash'];
171 // $files = explode("\n", $repo->get_files_by_commit($hash));
173 // $renderer->doc .= "<table><tr><th>What happened</th><th>File</th><th>link</th></tr>";
178 // $renderer->doc .= "<tr><td>";
184 // $renderer->doc .= "Added:";
187 // $renderer->doc .= "Modified:";
190 // $renderer->doc .= "Removed:";
193 // $renderer->doc .= "</td><td>";
195 // $renderer->doc .= $file;
196 // $renderer->doc .= "</td><td>";
197 // $renderer->doc .= ' <form method="post">';
198 …// $renderer->doc .= ' <input type="hidden" name="filename" value="'.$file.'" />';
199 …// $renderer->doc .= ' <input type="hidden" name="hash" value="'.$commit['hash'].…
200 // $renderer->doc .= ' <input type="submit" value="View Changes" />';
201 // $renderer->doc .= ' </form>';
202 // $renderer->doc .= "</td>";
203 // $renderer->doc .= "</tr>";
205 // $renderer->doc .= "</table>";
206 // $renderer->doc .= "</div>\n";
224 //Setup VIM: ex: et ts=4 enc=utf-8 :