$show_menu .= $sep; $revlist[] = $svnlog['rev']; if ($vars['rev'] == $svnlog['rev']) { $show_menu .= '<span class="pagemenu-selected">'; } $linktext = 'r' . $svnlog['rev'] . ' <small>' . format_timestamp($svnlog['date']) . '</small>'; $show_menu .= generate_link($linktext, array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'showconfig', 'rev' => $svnlog['rev'])); if ($vars['rev'] == $svnlog['rev']) { $show_menu .= '</span>' . PHP_EOL; } } } echo $show_menu; print_optionbar_end(); if (check_extension_exists('svn') && in_array($vars['rev'], $revlist)) { list($diff, $errors) = svn_diff($device_config_file, $vars['rev'] - 1, $device_config_file, $vars['rev']); if (!$diff) { $text = '没有区别'; } else { $text = ''; while (!feof($diff)) { $text .= fread($diff, 8192); } fclose($diff); fclose($errors); } } else { $fh = fopen($device_config_file, 'r') or die("Can't open file"); $text = fread($fh, filesize($device_config_file)); fclose($fh); }
function getDiff($path, $rev1, $rev2) { list($fout, $ferr) = svn_diff($this->mRepoPath . $path, $rev1, $this->mRepoPath . $path, $rev2); if ($fout) { // We have to read out the file descriptors. :P $out = ''; while (!feof($fout)) { $out .= fgets($fout); } fclose($fout); fclose($ferr); return $out; } else { return new MWException("Diffing error"); } }
$revlist[] = $svnlog['rev']; if ($vars['rev'] == $svnlog['rev']) { echo '<span class="pagemenu-selected">'; } $linktext = 'r' . $svnlog['rev'] . ' <small>' . date($config['dateformat']['byminute'], strtotime($svnlog['date'])) . '</small>'; echo generate_link($linktext, array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'showconfig', 'rev' => $svnlog['rev'])); if ($vars['rev'] == $svnlog['rev']) { echo '</span>'; } $sep = ' | '; } } //end if print_optionbar_end(); if (function_exists('svn_log') && in_array($vars['rev'], $revlist)) { list($diff, $errors) = svn_diff($file, $vars['rev'] - 1, $file, $vars['rev']); if (!$diff) { $text = 'No Difference'; } else { $text = ''; while (!feof($diff)) { $text .= fread($diff, 8192); } fclose($diff); fclose($errors); } } else { $fh = fopen($file, 'r') or die("Can't open file"); $text = fread($fh, filesize($file)); fclose($fh); }
<?php list($diff, $errors) = svn_diff('http://localhost/svn/swc', SVN_REVISION_HEAD, 'http://localhost/svn/jbiet', SVN_REVISION_HEAD); echo "kkk"; if (!$diff) { exit; } $contents = ''; while (!feof($diff)) { $contents .= fread($diff, 8192); } fclose($diff); fclose($errors); var_dump($contents); ?>
$svn_diff_file = DATA_DIR . $code_v1_md5 . "-" . $code_v2_md5 . ".diff"; // save the log save_log($ldap, $code_v1, $code_v2); $svn_v1_at_pos = strpos($code_v1, "@"); $svn_v2_at_pos = strpos($code_v2, "@"); $need_diff = false; if (!file_exists($svn_dir1) || $svn_v1_at_pos == false) { svn_export($ldap, $passwd, $code_v1, $svn_dir1); $need_diff = true; } if (!file_exists($svn_dir2) || $svn_v2_at_pos == false) { svn_export($ldap, $passwd, $code_v2, $svn_dir2); $need_diff = true; } if (!file_exists($svn_diff_file) || $need_diff == true) { svn_diff($ldap, $passwd, $code_v1, $code_v2, $svn_diff_file); } # call bash file to generate result.php file system("sh ./check_js.sh {$svn_dir1} {$svn_dir2} {$svn_diff_file}"); # touch("./result.php"); # output result to front include "./result.php"; # will delete it later /* $old_array = Array( "js_file_path1" => Array( Array("2323", "dfasa", "adsfa"), Array("2323", "dfasa", "adsfa"), Array("2323", "dfasa", "adsfa"), ), "js_file_path2" => Array(