From: <abe...@us...> - 2015-08-23 21:45:50
|
Revision: 7221 http://sourceforge.net/p/astlinux/code/7221 Author: abelbeck Date: 2015-08-23 21:45:48 +0000 (Sun, 23 Aug 2015) Log Message: ----------- web interface, add Topic 'Fossil-Commands' info in Fossil Commands sub-tab, Thanks Michael Modified Paths: -------------- branches/1.0/package/webinterface/altweb/admin/fossilcmd.php branches/1.0/package/webinterface/altweb/common/topics.info Modified: branches/1.0/package/webinterface/altweb/admin/fossilcmd.php =================================================================== --- branches/1.0/package/webinterface/altweb/admin/fossilcmd.php 2015-08-23 20:38:24 UTC (rev 7220) +++ branches/1.0/package/webinterface/altweb/admin/fossilcmd.php 2015-08-23 21:45:48 UTC (rev 7221) @@ -92,9 +92,9 @@ <form method="post" action="<?php echo $myself;?>" enctype="multipart/form-data"> <table width="100%" class="stdtable"> <tr><td style="text-align: center;" colspan="2"> - <h2>Fossil Commands:</h2> - </td></tr> <?php + putHtml('<h2>Fossil Commands:'.includeTOPICinfo('Fossil-Commands').'</h2>'); + putHtml('</td></tr>'); if (is_file('/var/run/fossil.pid')) { putHtml('<tr><td style="text-align: center;" colspan="2">'); @@ -129,7 +129,7 @@ if ($stat['size'] > $max) { @fseek($fp, -$max, SEEK_END); fgets($fp, 1024); - echo "<strong>----- File too large to display, showing the end of the file -----</strong>\n"; + echo "<strong>----- Result too large to display, showing the end of the output -----</strong>\n"; } while (! feof($fp)) { if ($line = fgets($fp, 1024)) { Modified: branches/1.0/package/webinterface/altweb/common/topics.info =================================================================== --- branches/1.0/package/webinterface/altweb/common/topics.info 2015-08-23 20:38:24 UTC (rev 7220) +++ branches/1.0/package/webinterface/altweb/common/topics.info 2015-08-23 21:45:48 UTC (rev 7221) @@ -358,3 +358,93 @@ You can see the last two entries here have custom names, if no name is given then it is up to the user's client to find a suitable name (e.g. take it from the contact's vcard/profile). +[[Fossil-Commands]] + +Fossil Commands: + +------------------------------------------------------------------------------ +AstLinux "helper" scripts for Fossil +------------------------------------------------------------------------------ + +The "fossil-status" command: + +Usage: fossil-status + +Report on the status of the current checkout. + +------------------------------------------------------------------------------ + +The "fossil-diff" command: + +Usage: fossil-diff [options] [FILE1 FILE2 ...] + +Show the difference between the current version of each of the FILEs +specified (as they exist on disk) and that same file as it was checked +out. Or if the FILE arguments are omitted, show the unsaved changed +currently in the working check-out. + +If the "--from VERSION" or "-r VERSION" option is used it specifies +the source check-in for the diff operation. If not specified, the +source check-in is the base check-in for the current check-out. + +If the "--to VERSION" option appears, it specifies the check-in from +which the second version of the file or files is taken. If there is +no "--to" option then the (possibly edited) files in the current check-out +are used. + +The "-N" or "--new-file" option causes the complete text of added or +deleted files to be displayed. + +The "--diff-binary" option enables or disables the inclusion of binary files +when using an external diff program. + +The "--binary" option causes files matching the glob PATTERN to be treated +as binary when considering if they should be used with external diff program. +This option overrides the "binary-glob" setting. + +Options: + --binary PATTERN Treat files that match the glob PATTERN as binary + --branch BRANCH Show diff of all changes on BRANCH + --brief Show filenames only + --context|-c N Use N lines of context + --diff-binary BOOL Include binary files when using external commands + --from|-r VERSION select VERSION as source for the diff + --side-by-side|-y side-by-side diff + --strip-trailing-cr Strip trailing CR + --to VERSION select VERSION as target for the diff + --unified unified diff + -v|--verbose output complete text of added or deleted files + -w|--ignore-all-space Ignore white space when comparing lines + -W|--width <num> Width of lines in side-by-side diff + -Z|--ignore-trailing-space Ignore changes to end-of-line whitespace + +------------------------------------------------------------------------------ + +The "fossil-commit" command: + +Usage: fossil-commit [comment-text] + +Create a new revision containing all of the changes in the current checkout. + +If no comment-text is provided, "auto commit via cron" will be used. + +All files that have changed will be committed, including added and removed files. + +Options: + comment-text use as commit comment message + +------------------------------------------------------------------------------ + +The "fossil-revert" command: + +Usage: fossil-revert [/mnt/kd/]FILE [hex_revision_num] + +Revert to the current repository version of FILE, or to +the version associated with baseline hex_revision_num. + +If FILE was part of a rename operation, both the original file +and the renamed file are reverted. + +Options: + hex_revision_num revert given FILE back to given REVISION + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |