diff options
Diffstat (limited to '.files')
22 files changed, 0 insertions, 1696 deletions
diff --git a/.files/.pget/pget-0.0.3-0.6.3.4.1.tar.gz b/.files/.pget/pget-0.0.3-0.6.3.4.1.tar.gz Binary files differdeleted file mode 100644 index cfec9fe..0000000 --- a/.files/.pget/pget-0.0.3-0.6.3.4.1.tar.gz +++ /dev/null diff --git a/.files/.pget/pget-wch b/.files/.pget/pget-wch deleted file mode 100755 index f7e9e25..0000000 --- a/.files/.pget/pget-wch +++ /dev/null @@ -1,232 +0,0 @@ -#!/bin/sh -# pget -ver="0.6.3.4.1" -# -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - - -##################################################################### -#################### Option Handling #################### -##################################################################### -mode="get" -a="" -file="" -ua="Pget/$ver" -base="" -mode="help" -while [ $# -gt 0 ]; do; case "$1" in - # subsitutions - -V | -v | --version) mode="version"; break;; - -h | --help ) mode="help"; break;; - # directory base - -B) base="$2"; shift;; - # prepends URL to relative links in -F -i file. - --base=*) base="$($1 | sed s/--base=//)";; - # user agent - -U) ua=$2; shift;; - # identify as AGENT instead of Pget/VERSION. - --user-agent=*) ua=$($1 | sed s/--user-agent=//);; - # file - -i) mode="file"; code=$2; shift;; - # download URLs found in FILE. - --input-file=*) - mode="file"; - code=$($1 | sed "s/--input-file=//");; - # not implemented functions - -e | --execute=* ) mode="error"; code="$1";; - #Recursive download: - -r | --recursive ) mode="error"; code="$1";; - -l | --level=* ) mode="error"; code="$1";; - --delete-after ) mode="error"; code="$1";; - -k | --convert-links ) mode="error"; code="$1";; - -K | --backup-converted ) mode="error"; code="$1";; - -m | --mirror ) mode="error"; code="$1";; - --page-requisites ) mode="error"; code="$1";; - --strict-comments ) mode="error"; code="$1";; - -A | --accept=* ) mode="error"; code="$1";; - -R | --reject=* ) mode="error"; code="$1";; - -D | --domains=* ) mode="error"; code="$1";; - --exclude-domains=* ) mode="error"; code="$1";; - --follow-ftp ) mode="error"; code="$1";; - --follow-tags=* ) mode="error"; code="$1";; - --ignore-tags=* ) mode="error"; code="$1";; - -H | --span-hosts ) mode="error"; code="$1";; - -L | --relative ) mode="error"; code="$1";; - -I | --include-directories=*) mode="error"; code="$1";; - -X | --exclude-directories=*) mode="error"; code="$1";; - -np | --no-parent ) mode="error"; code="$1";; - # removed functions - -O | --output-document=* ) mode="wget"; code="$1";; - -nc | --no-clobber ) mode="wget"; code="$1";; - -c | --continue ) mode="wget"; code="$1";; - -N | --timestamping ) mode="wget"; code="$1";; - --spider ) mode="wget"; code="$1";; - -P | --directory-prefix=* ) mode="wget"; code="$1";; - # general handling - # these are all wget options that take a second argument - -o | -a | -t | -T | -w | -Q) a="$a $1 $2"; shift;; - --) shift; break;; - -g | -p) break;; - -*) a="$a $1";; - *) break;; # terminate while loop -esac -shift -done - -# all command line switches are processed, -# "$@" contains all file names - -##################################################################### -#################### The Core #################### -##################################################################### -if [ $mode = "file" ]; then - set -- $(cat $code | tr '\n' ' ') - mode="get" -fi - -if [ $mode = "get" ]; then - od=$PWD - gz="false" - p="false" - while [ $# -gt 0 ]; do - while [ 1 -gt 0 ]; do - case "$1" in - -g) gz="true";; - -p) p="$2"; shift;; - *) break;; - esac - shift - done - - cache="$HOME/.pget/cache/$(dirname $2)" - mkdir -p $cache - cd $cache - - got="false" - file="$1" - temp="$HOME/.pget/cache/$2" - - if [ $gz = "true" ]; then - echo -n "A cached copy of the archive " - if [ -e $temp ]; then - echo "already exists" - before="$(stat -c %Y $temp)" - else - echo "does not exist" - before="false" - fi - else - if [ -e $file ]; then - echo "A local copy already exists" - before="$(stat -c %Y $file)" - mv $file $temp - else - echo "A local copy does not exist" - before="false" - fi - fi - - cd "$cache" - echo "\033[31m" - wget -N -U "$ua" $a $base$2 - echo "\033[0m" - after=$(stat -c %Y $temp) - if [ "$before" != "$after" ]; then - echo "A new version of the file was retrieved" - if [ $gz = "true" ]; then - echo "Decompressing..." - gunzip -c $temp > $file - gz="" - else - mv $temp $file - fi - - if [ $p != "false" ]; then - chmod $p $file - p="false" - fi - else - echo "A new version of the file was not retreived" - if [ $gz = "false" ]; then - mv $temp $file - fi - fi - shift 2 - done - cd $od -fi - -##################################################################### -#################### Messages! #################### -##################################################################### -if [ $mode = "wget" ]; then; cat <<__wget__ -You used the $code option." -This is a valid option in wget, but does not make sense in pget." -__wget__ -fi - -if [ $mode = "error" ]; then; cat <<__error__ -You used the $code option. This is a valid option in wget," -but has not been implemented in pget." -This does not mean it cannot be, it just hasn't yet." - PATCHES ARE WELCOME!" -" -For more information on pget, try 'pget -h' or 'pget --help'." -For more information on Wget, try 'wget -h' or 'wget --help'." -__error__ -fi - -if [ $mode = "version" ]; then; cat <<__version__ -pget $ver, running on top of $(wget -V | grep -i wget)" -" -pget (but not Wget) is copyright (C) 2009 Luke Shumaker" -This program is distributed in the hope that it will be useful," -but WITHOUT ANY WARRANTY; without even the implied warranty of" -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" -GNU General Public License for more details." -" -Originally written by Luke Shumaker <lukeshu@sbcglobal.net>." -" -Use 'wget -V' for more information about Wget" -__version__ -fi - -if [ $mode = "help" ]; then; cat <<__help__ -pget $ver, a non-interactive network retriever for eventual use in a -package manager and version control system. -Usage: pget [OPTIONS] [OPTIONS1] [FILE1] [URL1] [OPTIONS2] [FILE2] [URL2]... - or: pget [OPTIONS] -i [FILELIST] - -Mandatory arguments to long options are mandatory for short options too. -With arguments to short options, insert a space between them - do: -f file - don't: -ffile - -All of the pget options work are exactly like wget, - with the exeption that recursion is disabled, - as are - -O, --output-document=FILE write documents to FILE. - -nc, --no-clobber skip downloads that would download - to existing files. - -c, --continue resume getting a partially- - downloaded file. - -N, --timestamping pget always checks timestamps - --spider don't download anything. - -P, --directory-prefix=PREFIX save files to PREFIX/... - and '-e' / '--execute=*' is not implemented [yet], - -File options: - -g The file needs to be ran throught gunzip. - -p PERMISSIONS Run 'chown PERMISSIONS FILENAME' on the - file after it is downloaded - -Report bugs to <lukeshu@sbcglobal.net>. -__help__ -fi - diff --git a/.files/Diff.java b/.files/Diff.java deleted file mode 100644 index 71e220b..0000000 --- a/.files/Diff.java +++ /dev/null @@ -1,896 +0,0 @@ -/* - * $Log: Diff.java,v $ - * Revision 1.7 2009/01/19 03:05:26 stuart - * Fix StackOverflow bug with heuristic on reported by Jimmy Han. - * - * Revision 1.6 2003/03/06 22:51:32 stuart - * Convert to CVS - * - * Revision 1.5 2002/07/19 19:14:40 stuart - * fix reverseScript, make change ctor public, update docs - * - * Revision 1.4 2002/04/09 17:53:39 stuart - * More flexible interface for diff() function. - * - * Revision 1.3 2000/03/03 21:58:03 stuart - * move discard_confusing_lines and shift_boundaries to class file_data - * - * Revision 1.2 2000/03/02 16:37:38 stuart - * Add GPL and copyright - * - */ -package bmsi.util; - -import java.util.Hashtable; - -/** A class to compare vectors of objects. The result of comparison - is a list of <code>change</code> objects which form an - edit script. The objects compared are traditionally lines - of text from two files. Comparison options such as "ignore - whitespace" are implemented by modifying the <code>equals</code> - and <code>hashcode</code> methods for the objects compared. -<p> - The basic algorithm is described in: </br> - "An O(ND) Difference Algorithm and its Variations", Eugene Myers, - Algorithmica Vol. 1 No. 2, 1986, p 251. -<p> - This class outputs different results from GNU diff 1.15 on some - inputs. Our results are actually better (smaller change list, smaller - total size of changes), but it would be nice to know why. Perhaps - there is a memory overwrite bug in GNU diff 1.15. - - @author Stuart D. Gathman, translated from GNU diff 1.15 - Copyright (C) 2000 Business Management Systems, Inc. -<p> - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, or (at your option) - any later version. -<p> - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -<p> - You should have received a copy of the <a href=COPYING.txt> - GNU General Public License</a> - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ - -public class Diff { - - /** Prepare to find differences between two arrays. Each element of - the arrays is translated to an "equivalence number" based on - the result of <code>equals</code>. The original Object arrays - are no longer needed for computing the differences. They will - be needed again later to print the results of the comparison as - an edit script, if desired. - */ - public Diff(Object[] a,Object[] b) { - Hashtable h = new Hashtable(a.length + b.length); - filevec[0] = new file_data(a,h); - filevec[1] = new file_data(b,h); - } - - /** 1 more than the maximum equivalence value used for this or its - sibling file. */ - private int equiv_max = 1; - - /** When set to true, the comparison uses a heuristic to speed it up. - With this heuristic, for files with a constant small density - of changes, the algorithm is linear in the file size. */ - public boolean heuristic = false; - - /** When set to true, the algorithm returns a guarranteed minimal - set of changes. This makes things slower, sometimes much slower. */ - public boolean no_discards = false; - - private int[] xvec, yvec; /* Vectors being compared. */ - private int[] fdiag; /* Vector, indexed by diagonal, containing - the X coordinate of the point furthest - along the given diagonal in the forward - search of the edit matrix. */ - private int[] bdiag; /* Vector, indexed by diagonal, containing - the X coordinate of the point furthest - along the given diagonal in the backward - search of the edit matrix. */ - private int fdiagoff, bdiagoff; - private final file_data[] filevec = new file_data[2]; - private int cost; - /** Snakes bigger than this are considered "big". */ - private static final int SNAKE_LIMIT = 20; - - /** Find the midpoint of the shortest edit script for a specified - portion of the two files. - - We scan from the beginnings of the files, and simultaneously from the ends, - doing a breadth-first search through the space of edit-sequence. - When the two searches meet, we have found the midpoint of the shortest - edit sequence. - - The value returned is the number of the diagonal on which the midpoint lies. - The diagonal number equals the number of inserted lines minus the number - of deleted lines (counting only lines before the midpoint). - The edit cost is stored into COST; this is the total number of - lines inserted or deleted (counting only lines before the midpoint). - - This function assumes that the first lines of the specified portions - of the two files do not match, and likewise that the last lines do not - match. The caller must trim matching lines from the beginning and end - of the portions it is going to specify. - - Note that if we return the "wrong" diagonal value, or if - the value of bdiag at that diagonal is "wrong", - the worst this can do is cause suboptimal diff output. - It cannot cause incorrect diff output. */ - - private int diag (int xoff, int xlim, int yoff, int ylim) { - final int[] fd = fdiag; // Give the compiler a chance. - final int[] bd = bdiag; // Additional help for the compiler. - final int[] xv = xvec; // Still more help for the compiler. - final int[] yv = yvec; // And more and more . . . - final int dmin = xoff - ylim; // Minimum valid diagonal. - final int dmax = xlim - yoff; // Maximum valid diagonal. - final int fmid = xoff - yoff; // Center diagonal of top-down search. - final int bmid = xlim - ylim; // Center diagonal of bottom-up search. - int fmin = fmid, fmax = fmid; // Limits of top-down search. - int bmin = bmid, bmax = bmid; // Limits of bottom-up search. - /* True if southeast corner is on an odd - diagonal with respect to the northwest. */ - final boolean odd = (fmid - bmid & 1) != 0; - - fd[fdiagoff + fmid] = xoff; - bd[bdiagoff + bmid] = xlim; - - for (int c = 1;; ++c) - { - int d; /* Active diagonal. */ - boolean big_snake = false; - - /* Extend the top-down search by an edit step in each diagonal. */ - if (fmin > dmin) - fd[fdiagoff + --fmin - 1] = -1; - else - ++fmin; - if (fmax < dmax) - fd[fdiagoff + ++fmax + 1] = -1; - else - --fmax; - for (d = fmax; d >= fmin; d -= 2) - { - int x, y, oldx, tlo = fd[fdiagoff + d - 1], thi = fd[fdiagoff + d + 1]; - - if (tlo >= thi) - x = tlo + 1; - else - x = thi; - oldx = x; - y = x - d; - while (x < xlim && y < ylim && xv[x] == yv[y]) { - ++x; ++y; - } - if (x - oldx > SNAKE_LIMIT) - big_snake = true; - fd[fdiagoff + d] = x; - if (odd && bmin <= d && d <= bmax && bd[bdiagoff + d] <= fd[fdiagoff + d]) - { - cost = 2 * c - 1; - return d; - } - } - - /* Similar extend the bottom-up search. */ - if (bmin > dmin) - bd[bdiagoff + --bmin - 1] = Integer.MAX_VALUE; - else - ++bmin; - if (bmax < dmax) - bd[bdiagoff + ++bmax + 1] = Integer.MAX_VALUE; - else - --bmax; - for (d = bmax; d >= bmin; d -= 2) - { - int x, y, oldx, tlo = bd[bdiagoff + d - 1], thi = bd[bdiagoff + d + 1]; - - if (tlo < thi) - x = tlo; - else - x = thi - 1; - oldx = x; - y = x - d; - while (x > xoff && y > yoff && xv[x - 1] == yv[y - 1]) { - --x; --y; - } - if (oldx - x > SNAKE_LIMIT) - big_snake = true; - bd[bdiagoff + d] = x; - if (!odd && fmin <= d && d <= fmax && bd[bdiagoff + d] <= fd[fdiagoff + d]) - { - cost = 2 * c; - return d; - } - } - - /* Heuristic: check occasionally for a diagonal that has made - lots of progress compared with the edit distance. - If we have any such, find the one that has made the most - progress and return it as if it had succeeded. - - With this heuristic, for files with a constant small density - of changes, the algorithm is linear in the file size. */ - - if (c > 200 && big_snake && heuristic) - { - int best = 0; - int bestpos = -1; - - for (d = fmax; d >= fmin; d -= 2) - { - int dd = d - fmid; - int x = fd[fdiagoff + d]; - int y = x - d; - int v = (x - xoff) * 2 - dd; - if (v > 12 * (c + (dd < 0 ? -dd : dd))) - { - if (v > best - && xoff + SNAKE_LIMIT <= x && x < xlim - && yoff + SNAKE_LIMIT <= y && y < ylim) - { - /* We have a good enough best diagonal; - now insist that it end with a significant snake. */ - int k; - - for (k = 1; xvec[x - k] == yvec[y - k]; k++) - if (k == SNAKE_LIMIT) - { - best = v; - bestpos = d; - break; - } - } - } - } - if (best > 0) - { - cost = 2 * c - 1; - return bestpos; - } - - best = 0; - for (d = bmax; d >= bmin; d -= 2) - { - int dd = d - bmid; - int x = bd[bdiagoff + d]; - int y = x - d; - int v = (xlim - x) * 2 + dd; - if (v > 12 * (c + (dd < 0 ? -dd : dd))) - { - if (v > best - && xoff < x && x <= xlim - SNAKE_LIMIT - && yoff < y && y <= ylim - SNAKE_LIMIT) - { - /* We have a good enough best diagonal; - now insist that it end with a significant snake. */ - int k; - - for (k = 0; xvec[x + k] == yvec[y + k]; k++) - if (k == SNAKE_LIMIT) - { - best = v; - bestpos = d; - break; - } - } - } - } - if (best > 0) - { - cost = 2 * c - 1; - return bestpos; - } - } - } - } - - /** Compare in detail contiguous subsequences of the two files - which are known, as a whole, to match each other. - - The results are recorded in the vectors filevec[N].changed_flag, by - storing a 1 in the element for each line that is an insertion or deletion. - - The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1. - - Note that XLIM, YLIM are exclusive bounds. - All line numbers are origin-0 and discarded lines are not counted. */ - - private void compareseq (int xoff, int xlim, int yoff, int ylim) { - /* Slide down the bottom initial diagonal. */ - while (xoff < xlim && yoff < ylim && xvec[xoff] == yvec[yoff]) { - ++xoff; ++yoff; - } - /* Slide up the top initial diagonal. */ - while (xlim > xoff && ylim > yoff && xvec[xlim - 1] == yvec[ylim - 1]) { - --xlim; --ylim; - } - - /* Handle simple cases. */ - if (xoff == xlim) - while (yoff < ylim) - filevec[1].changed_flag[1+filevec[1].realindexes[yoff++]] = true; - else if (yoff == ylim) - while (xoff < xlim) - filevec[0].changed_flag[1+filevec[0].realindexes[xoff++]] = true; - else - { - /* Find a point of correspondence in the middle of the files. */ - - int d = diag (xoff, xlim, yoff, ylim); - int c = cost; - int f = fdiag[fdiagoff + d]; - int b = bdiag[bdiagoff + d]; - - if (c == 1) - { - /* This should be impossible, because it implies that - one of the two subsequences is empty, - and that case was handled above without calling `diag'. - Let's verify that this is true. */ - throw new IllegalArgumentException("Empty subsequence"); - } - else - { - /* Use that point to split this problem into two subproblems. */ - compareseq (xoff, b, yoff, b - d); - /* This used to use f instead of b, - but that is incorrect! - It is not necessarily the case that diagonal d - has a snake from b to f. */ - compareseq (b, xlim, b - d, ylim); - } - } - } - - /** Discard lines from one file that have no matches in the other file. - */ - - private void discard_confusing_lines() { - filevec[0].discard_confusing_lines(filevec[1]); - filevec[1].discard_confusing_lines(filevec[0]); - } - - private boolean inhibit = false; - - /** Adjust inserts/deletes of blank lines to join changes - as much as possible. - */ - - private void shift_boundaries() { - if (inhibit) - return; - filevec[0].shift_boundaries(filevec[1]); - filevec[1].shift_boundaries(filevec[0]); - } - - public interface ScriptBuilder { - /** Scan the tables of which lines are inserted and deleted, - producing an edit script. - @param changed0 true for lines in first file which do not match 2nd - @param len0 number of lines in first file - @param changed1 true for lines in 2nd file which do not match 1st - @param len1 number of lines in 2nd file - @return a linked list of changes - or null - */ - public change build_script( - boolean[] changed0,int len0, - boolean[] changed1,int len1 - ); - } - - /** Scan the tables of which lines are inserted and deleted, - producing an edit script in reverse order. */ - - static class ReverseScript implements ScriptBuilder { - public change build_script( - final boolean[] changed0,int len0, - final boolean[] changed1,int len1) - { - change script = null; - int i0 = 0, i1 = 0; - while (i0 < len0 || i1 < len1) { - if (changed0[1+i0] || changed1[1+i1]) { - int line0 = i0, line1 = i1; - - /* Find # lines changed here in each file. */ - while (changed0[1+i0]) ++i0; - while (changed1[1+i1]) ++i1; - - /* Record this change. */ - script = new change(line0, line1, i0 - line0, i1 - line1, script); - } - - /* We have reached lines in the two files that match each other. */ - i0++; i1++; - } - - return script; - } - } - - static class ForwardScript implements ScriptBuilder { - /** Scan the tables of which lines are inserted and deleted, - producing an edit script in forward order. */ - public change build_script( - final boolean[] changed0,int len0, - final boolean[] changed1,int len1) - { - change script = null; - int i0 = len0, i1 = len1; - - while (i0 >= 0 || i1 >= 0) - { - if (changed0[i0] || changed1[i1]) - { - int line0 = i0, line1 = i1; - - /* Find # lines changed here in each file. */ - while (changed0[i0]) --i0; - while (changed1[i1]) --i1; - - /* Record this change. */ - script = new change(i0, i1, line0 - i0, line1 - i1, script); - } - - /* We have reached lines in the two files that match each other. */ - i0--; i1--; - } - - return script; - } - } - - /** Standard ScriptBuilders. */ - public final static ScriptBuilder - forwardScript = new ForwardScript(), - reverseScript = new ReverseScript(); - - /* Report the differences of two files. DEPTH is the current directory - depth. */ - public final change diff_2(final boolean reverse) { - return diff(reverse ? reverseScript : forwardScript); - } - - /** Get the results of comparison as an edit script. The script - is described by a list of changes. The standard ScriptBuilder - implementations provide for forward and reverse edit scripts. - Alternate implementations could, for instance, list common elements - instead of differences. - @param bld an object to build the script from change flags - @return the head of a list of changes - */ - public change diff(final ScriptBuilder bld) { - - /* Some lines are obviously insertions or deletions - because they don't match anything. Detect them now, - and avoid even thinking about them in the main comparison algorithm. */ - - discard_confusing_lines (); - - /* Now do the main comparison algorithm, considering just the - undiscarded lines. */ - - xvec = filevec[0].undiscarded; - yvec = filevec[1].undiscarded; - - int diags = - filevec[0].nondiscarded_lines + filevec[1].nondiscarded_lines + 3; - fdiag = new int[diags]; - fdiagoff = filevec[1].nondiscarded_lines + 1; - bdiag = new int[diags]; - bdiagoff = filevec[1].nondiscarded_lines + 1; - - compareseq (0, filevec[0].nondiscarded_lines, - 0, filevec[1].nondiscarded_lines); - fdiag = null; - bdiag = null; - - /* Modify the results slightly to make them prettier - in cases where that can validly be done. */ - - shift_boundaries (); - - /* Get the results of comparison in the form of a chain - of `struct change's -- an edit script. */ - return bld.build_script( - filevec[0].changed_flag, - filevec[0].buffered_lines, - filevec[1].changed_flag, - filevec[1].buffered_lines - ); - - } - - /** The result of comparison is an "edit script": a chain of change objects. - Each change represents one place where some lines are deleted - and some are inserted. - - LINE0 and LINE1 are the first affected lines in the two files (origin 0). - DELETED is the number of lines deleted here from file 0. - INSERTED is the number of lines inserted here in file 1. - - If DELETED is 0 then LINE0 is the number of the line before - which the insertion was done; vice versa for INSERTED and LINE1. */ - - public static class change { - /** Previous or next edit command. */ - public change link; - /** # lines of file 1 changed here. */ - public final int inserted; - /** # lines of file 0 changed here. */ - public final int deleted; - /** Line number of 1st deleted line. */ - public final int line0; - /** Line number of 1st inserted line. */ - public final int line1; - - /** Cons an additional entry onto the front of an edit script OLD. - LINE0 and LINE1 are the first affected lines in the two files (origin 0). - DELETED is the number of lines deleted here from file 0. - INSERTED is the number of lines inserted here in file 1. - - If DELETED is 0 then LINE0 is the number of the line before - which the insertion was done; vice versa for INSERTED and LINE1. */ - public change(int line0, int line1, int deleted, int inserted, change old) { - this.line0 = line0; - this.line1 = line1; - this.inserted = inserted; - this.deleted = deleted; - this.link = old; - //System.err.println(line0+","+line1+","+inserted+","+deleted); - } - } - - /** Data on one input file being compared. - */ - - class file_data { - - /** Allocate changed array for the results of comparison. */ - void clear() { - /* Allocate a flag for each line of each file, saying whether that line - is an insertion or deletion. - Allocate an extra element, always zero, at each end of each vector. - */ - changed_flag = new boolean[buffered_lines + 2]; - } - - /** Return equiv_count[I] as the number of lines in this file - that fall in equivalence class I. - @return the array of equivalence class counts. - */ - int[] equivCount() { - int[] equiv_count = new int[equiv_max]; - for (int i = 0; i < buffered_lines; ++i) - ++equiv_count[equivs[i]]; - return equiv_count; - } - - /** Discard lines that have no matches in another file. - - A line which is discarded will not be considered by the actual - comparison algorithm; it will be as if that line were not in the file. - The file's `realindexes' table maps virtual line numbers - (which don't count the discarded lines) into real line numbers; - this is how the actual comparison algorithm produces results - that are comprehensible when the discarded lines are counted. -<p> - When we discard a line, we also mark it as a deletion or insertion - so that it will be printed in the output. - @param f the other file - */ - void discard_confusing_lines(file_data f) { - clear(); - /* Set up table of which lines are going to be discarded. */ - final byte[] discarded = discardable(f.equivCount()); - - /* Don't really discard the provisional lines except when they occur - in a run of discardables, with nonprovisionals at the beginning - and end. */ - filterDiscards(discarded); - - /* Actually discard the lines. */ - discard(discarded); - } - - /** Mark to be discarded each line that matches no line of another file. - If a line matches many lines, mark it as provisionally discardable. - @see equivCount() - @param counts The count of each equivalence number for the other file. - @return 0=nondiscardable, 1=discardable or 2=provisionally discardable - for each line - */ - - private byte[] discardable(final int[] counts) { - final int end = buffered_lines; - final byte[] discards = new byte[end]; - final int[] equivs = this.equivs; - int many = 5; - int tem = end / 64; - - /* Multiply MANY by approximate square root of number of lines. - That is the threshold for provisionally discardable lines. */ - while ((tem = tem >> 2) > 0) - many *= 2; - - for (int i = 0; i < end; i++) - { - int nmatch; - if (equivs[i] == 0) - continue; - nmatch = counts[equivs[i]]; - if (nmatch == 0) - discards[i] = 1; - else if (nmatch > many) - discards[i] = 2; - } - return discards; - } - - /** Don't really discard the provisional lines except when they occur - in a run of discardables, with nonprovisionals at the beginning - and end. */ - - private void filterDiscards(final byte[] discards) { - final int end = buffered_lines; - - for (int i = 0; i < end; i++) - { - /* Cancel provisional discards not in middle of run of discards. */ - if (discards[i] == 2) - discards[i] = 0; - else if (discards[i] != 0) - { - /* We have found a nonprovisional discard. */ - int j; - int length; - int provisional = 0; - - /* Find end of this run of discardable lines. - Count how many are provisionally discardable. */ - for (j = i; j < end; j++) - { - if (discards[j] == 0) - break; - if (discards[j] == 2) - ++provisional; - } - - /* Cancel provisional discards at end, and shrink the run. */ - while (j > i && discards[j - 1] == 2) { - discards[--j] = 0; --provisional; - } - - /* Now we have the length of a run of discardable lines - whose first and last are not provisional. */ - length = j - i; - - /* If 1/4 of the lines in the run are provisional, - cancel discarding of all provisional lines in the run. */ - if (provisional * 4 > length) - { - while (j > i) - if (discards[--j] == 2) - discards[j] = 0; - } - else - { - int consec; - int minimum = 1; - int tem = length / 4; - - /* MINIMUM is approximate square root of LENGTH/4. - A subrun of two or more provisionals can stand - when LENGTH is at least 16. - A subrun of 4 or more can stand when LENGTH >= 64. */ - while ((tem = tem >> 2) > 0) - minimum *= 2; - minimum++; - - /* Cancel any subrun of MINIMUM or more provisionals - within the larger run. */ - for (j = 0, consec = 0; j < length; j++) - if (discards[i + j] != 2) - consec = 0; - else if (minimum == ++consec) - /* Back up to start of subrun, to cancel it all. */ - j -= consec; - else if (minimum < consec) - discards[i + j] = 0; - - /* Scan from beginning of run - until we find 3 or more nonprovisionals in a row - or until the first nonprovisional at least 8 lines in. - Until that point, cancel any provisionals. */ - for (j = 0, consec = 0; j < length; j++) - { - if (j >= 8 && discards[i + j] == 1) - break; - if (discards[i + j] == 2) { - consec = 0; discards[i + j] = 0; - } - else if (discards[i + j] == 0) - consec = 0; - else - consec++; - if (consec == 3) - break; - } - - /* I advances to the last line of the run. */ - i += length - 1; - - /* Same thing, from end. */ - for (j = 0, consec = 0; j < length; j++) - { - if (j >= 8 && discards[i - j] == 1) - break; - if (discards[i - j] == 2) { - consec = 0; discards[i - j] = 0; - } - else if (discards[i - j] == 0) - consec = 0; - else - consec++; - if (consec == 3) - break; - } - } - } - } - } - - /** Actually discard the lines. - @param discards flags lines to be discarded - */ - private void discard(final byte[] discards) { - final int end = buffered_lines; - int j = 0; - for (int i = 0; i < end; ++i) - if (no_discards || discards[i] == 0) - { - undiscarded[j] = equivs[i]; - realindexes[j++] = i; - } - else - changed_flag[1+i] = true; - nondiscarded_lines = j; - } - - file_data(Object[] data,Hashtable h) { - buffered_lines = data.length; - - equivs = new int[buffered_lines]; - undiscarded = new int[buffered_lines]; - realindexes = new int[buffered_lines]; - - for (int i = 0; i < data.length; ++i) { - Integer ir = (Integer)h.get(data[i]); - if (ir == null) - h.put(data[i],new Integer(equivs[i] = equiv_max++)); - else - equivs[i] = ir.intValue(); - } - } - - /** Adjust inserts/deletes of blank lines to join changes - as much as possible. - - We do something when a run of changed lines include a blank - line at one end and have an excluded blank line at the other. - We are free to choose which blank line is included. - `compareseq' always chooses the one at the beginning, - but usually it is cleaner to consider the following blank line - to be the "change". The only exception is if the preceding blank line - would join this change to other changes. - @param f the file being compared against - */ - - void shift_boundaries(file_data f) { - final boolean[] changed = changed_flag; - final boolean[] other_changed = f.changed_flag; - int i = 0; - int j = 0; - int i_end = buffered_lines; - int preceding = -1; - int other_preceding = -1; - - for (;;) - { - int start, end, other_start; - - /* Scan forwards to find beginning of another run of changes. - Also keep track of the corresponding point in the other file. */ - - while (i < i_end && !changed[1+i]) - { - while (other_changed[1+j++]) - /* Non-corresponding lines in the other file - will count as the preceding batch of changes. */ - other_preceding = j; - i++; - } - - if (i == i_end) - break; - - start = i; - other_start = j; - - for (;;) - { - /* Now find the end of this run of changes. */ - - while (i < i_end && changed[1+i]) i++; - end = i; - - /* If the first changed line matches the following unchanged one, - and this run does not follow right after a previous run, - and there are no lines deleted from the other file here, - then classify the first changed line as unchanged - and the following line as changed in its place. */ - - /* You might ask, how could this run follow right after another? - Only because the previous run was shifted here. */ - - if (end != i_end - && equivs[start] == equivs[end] - && !other_changed[1+j] - && end != i_end - && !((preceding >= 0 && start == preceding) - || (other_preceding >= 0 - && other_start == other_preceding))) - { - changed[1+end++] = true; - changed[1+start++] = false; - ++i; - /* Since one line-that-matches is now before this run - instead of after, we must advance in the other file - to keep in synch. */ - ++j; - } - else - break; - } - - preceding = i; - other_preceding = j; - } - } - - /** Number of elements (lines) in this file. */ - final int buffered_lines; - - /** Vector, indexed by line number, containing an equivalence code for - each line. It is this vector that is actually compared with that - of another file to generate differences. */ - private final int[] equivs; - - /** Vector, like the previous one except that - the elements for discarded lines have been squeezed out. */ - final int[] undiscarded; - - /** Vector mapping virtual line numbers (not counting discarded lines) - to real ones (counting those lines). Both are origin-0. */ - final int[] realindexes; - - /** Total number of nondiscarded lines. */ - int nondiscarded_lines; - - /** Array, indexed by real origin-1 line number, - containing true for a line that is an insertion or a deletion. - The results of comparison are stored here. */ - boolean[] changed_flag; - - } -} diff --git a/.files/README-0.5.10.xhtml b/.files/README-0.5.10.xhtml deleted file mode 100644 index e3c171f..0000000 --- a/.files/README-0.5.10.xhtml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <title>rvs 0.5.10</title> - <meta http-equiv="content-type" content="text/html; charset=utf-8"/> -</head> -<body> -<h1>rvs 0.5.10</h1> -<p>rvs is a basic versioning system I've been writing. If you don't know what that means, it isn't for you (at least not at this stage in development).</p> - -<h2>installation</h2> -<p>Download the tarball <a href="http://bazaar.launchpad.net/%7Elukeshu/%2Bjunk/rvs-release/download/head%3A/rvs0.5.10.tar.gz-20090626054542-a8njfgco94idohdt-1/rvs-0.5.10.tar.gz"><kbd>rvs-0.5.10.tar.gz</kbd></a>.</p> -<p>To install, simply extract the tarball in the root directory (preferably as root).</p> -<p>Here is a list of all the files in <kbd>rvs-0.5.10.tar.gz</kbd>:</p> -<ul> - <li><kbd>/etc/abomination/modules/rvs/commit</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/commit.d</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/commit.f</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/get</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/get.d</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/get.f</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/init</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/lib/rvsdb</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/lib/stdio</kbd></li> - <li><kbd>/usr/bin/rvs</kbd></li> -</ul> - -<h2>system requirements</h2> -<p>Pretty much any *nix system should be able to run rvs, provided it has bash, and bash is installed at <kbd>/bin/bash</kbd> (e.g.: <a href="http://www.freebsd.org/">FreeBSD</a> has it at <kbd>/usr/bin/bash</kbd>, so you should set up a symlink). rvs is not designed for Windows, but should be able to run in bash if you have some *nix pack installed.</p> -<p>To my knowledge, this is the absolute requirements (all need to be in your PATH):</p> -<ul> - <li><a href="http://www.gnu.org/software/bash/">bash</a> (needs to be installed at <kbd>/bin/bash</kbd>)</li> - <li>cat (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>cp (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>cut (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>echo (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>mkdir (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>rm (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>sed (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>sha1sum (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>tempfile (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> - <li>tr (included in <a href="http://www.gnu.org/software/coreutils/">GNU Core Utils</a>)</li> -</ul> - -<h2>usage</h2> -<dl> - <dt>create repository in the current directory</dt> - <dd><kbd>rvs init</kbd></dd> - <dt>check in the current directory</dt> - <dd><kbd>rvs commit</kbd> This will return a commit id. You need this to check the revision back out.</dd> - <dt>check out to the current directory</dt> - <dd><kbd>rvs get <var>ID</var></kbd> This checks out commit <var>ID</var></dd> -</dl> -<p>The system will bork if you have filenames with spaces or newlines. Why? Because you haven't written a patch to fix it yet.</p> -<p>Feel free to push to the <a href="https://code.launchpad.net/~lukeshu/+junk/rvs-release">launchpad repository</a>.</p> - -<h2>hacking</h2> -<p>Again, here is a list of all files in <kbd>rvs-0.5.10.tar.gz</kbd>:</p> -<ul> - <li><kbd>/etc/abomination/modules/rvs/commit</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/commit.d</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/commit.f</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/get</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/get.d</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/get.f</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/init</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/lib/rvsdb</kbd></li> - <li><kbd>/etc/abomination/modules/rvs/lib/stdio</kbd></li> - <li><kbd>/usr/bin/rvs</kbd></li> -</ul> -<p>These are all shell scripts and may be modified directly. I have designed this system to be extremely modular. As you may have figured out, each bit on functionality is in it's own script, and <kbd>/usr/bin/rvs</kbd> is just a wrapper for them. If you wish to move the directory with the sub-modules, all you have to do is update the variablle <code><var>RVSDIR</var></code> towards the beginning of <kbd>/usr/bin/rvs</kbd>.</p> -<p><kbd>commit</kbd> actually does take a parameter. It can commit any file or directory. It works as it does because if no file is given, it defaults to <kbd>./</kbd>. If it is given a directory (as it is by default), it loops through each file in the directory and commits them (by calling itself). In order to actually commit a file or directory it calls <code>rvs commit.<var>type</var></code> where <var>type</var> is the standard unix file-type code:</p> - -<table> - <tr><td><pre><em>b</em>lock (buffered) special</pre></td><td>b</td></tr> - <tr><td><pre><em>c</em>haracter (unbuffered) special</pre></td><td>c</td></tr> - <tr><td><pre><em>d</em>irectory </pre></td><td>d</td></tr> - <tr><td><pre>named <em>p</em>ipe (FIFO) </pre></td><td>p</td></tr> - <tr><td><pre>regular <em>f</em>ile </pre></td><td>f</td></tr> - <tr><td><pre>symbolic <em>l</em>ink </pre></td><td>l</td></tr> - <tr><td><pre><em>d</em>ocket </pre></td><td>s</td></tr> - <tr><td><pre><em>d</em>oor (Solaris only) </pre></td><td>D</td></tr> -</table> -<p>As you probably noticed, only directories and regular files have been implemented in this release. <kbd>get</kbd> works in much the same way. If you implement any other file types, save the commit and get functions accordingly, and uncomment the line in <kbd>/etc/abomination/modules/rvs/commit</kbd>. Any commit function takes a filename as an argument and outputs the according commit id to stdout. Any get function takes the commit id as an argument and uses stdout only if verbose, or to report errors. So the modules communicate via pipes, which is generally considered bad-design, and libraries should be used. I deliberatly broke this because this way:</p> -<ol> - <li>incompatible licences can be used for different modules</li> - <li>modules can be added/removed on the fly</li> - <li>one can use any lanugage to write new modules, without having to worry about bindings</li> -</ol> - -<h3>TODO</h3> -<ul> - <li>implment other unix file types (see above)</li> - <li>add real option handling (code from another project is provided in <kbd>/usr/bin/rvs</kbd>)</li> - <li>write real documentation</li> - <li>implment a parent/child tree<ul> - <li>implement branch ids (NOTE: <q>wch</q> should be used to refer to the latest commit in a branch)</li> - </ul></li> - <li>implement tags</li> - <li>owner/filepermissions/timestamps</li> - <li>usernames/author</li> -</ul> - -<p>I have set up bazaar repository at <a href="https://code.launchpad.net/~lukeshu/+junk/rvs-release">Launchpad</a>. Only until rvs becomes self-hosting.</p> -<p>If anyone needs any help, let me know. -<br />~ Luke Shumaker <<a href="mailto:lukeshu@sbcglobal.net">LukeShu@sbcglobal.net</a>> -<br />Happy Hacking!</p> -</body> -</html> - diff --git a/.files/etc/abomination/modules/rvs/commit b/.files/etc/abomination/modules/rvs/commit deleted file mode 100755 index 6ff39a0..0000000 --- a/.files/etc/abomination/modules/rvs/commit +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# abomination module:rvs:commit -name='rvs commit' -ver='0.5.10' -usage='[OPTIONS] [FILE]' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -# commit FILE -if [ $# -gt 0 ]; then - file="$1" -else - file='.' -fi - -if [ ! -e $file]; then error "file \`$file' does not exist"; -# START file type list -#elif [ -b $file ]; type='b'; # block (buffered) special -#elif [ -c $file ]; type='c'; # character (unbuffered) special -elif [ -d $file ]; type='d'; # directory -#elif [ -p $file ]; type='p'; # named pipe (FIFO) -elif [ -f $file ]; type='f'; # regular file -#elif [ -l $file ]; type='l'; # symbolic link -#elif [ -s $file ]; type='s'; # socket -#elif [ -D $file ]; type='D'; # door (Solaris only) -# END file type list -fi - -ret=`rvs "commit.$type" "$file"` - -tmp=`tempfile` -loginit "$tmp" -logwrite "$tmp" 'name' "$file" -logwrite "$tmp" 'hash' "$ret" -logwrite "$tmp" 'type' "$type" -logwrite "$tmp" 'author' "$user" -logwrite "$tmp" 'owner' "$owner" -logwrite "$tmp" 'owner' "$license" -#parents=`logfind "$repo/co" "$file"` the checkout log is getting an overhaul -#logwrite "$tmp" 'parents' "$parents" -#case "$type" in -# f) -# #logwrite "$tmp" 'f.type' "$" -# :;; -#esac - -rvs commit.f "$tmp" -rm "$tmp" - diff --git a/.files/etc/abomination/modules/rvs/commit.d b/.files/etc/abomination/modules/rvs/commit.d deleted file mode 100755 index 91a75c4..0000000 --- a/.files/etc/abomination/modules/rvs/commit.d +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# abomination module:rvs:commit:d -name='rvs commit.d' -ver='0.5.10' -usage='[OPTIONS] DIRECTORY' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -# commit.d DIRNAME -dir="$1" - -tmp=`tempfile` -loginit "$tmp" -for file in $dir; do - hash=`commit "$dir/$file"` - echo "$file:$hash" >> "$tmp" -done - -rvs commit.f "$tmp" -rm "$tmp" - diff --git a/.files/etc/abomination/modules/rvs/commit.f b/.files/etc/abomination/modules/rvs/commit.f deleted file mode 100755 index 78c5d59..0000000 --- a/.files/etc/abomination/modules/rvs/commit.f +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# abomination module:rvs:commit:f -name='rvs commit.f' -ver='0.5.10' -usage='[OPTIONS] FILE' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -# commit.f FILENAME -file="$1" - -hash=`getid $file` -if [ ! -f "$repo/files/$hash" ]; then - cp "$file" "$repo/files/$hash" -fi -echo "$hash" - diff --git a/.files/etc/abomination/modules/rvs/get b/.files/etc/abomination/modules/rvs/get deleted file mode 100755 index dce3ac7..0000000 --- a/.files/etc/abomination/modules/rvs/get +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# abomination module:rvs:get -name='rvs commit' -ver='0.5.10' -usage='[OPTIONS] ID [FILENAME]' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -# get ID [FILE] -id="$1" - -if [ $# -gt 1 ]; then - file="$2" -fi - -tmp=`tempfile` -rvs get.f "$id" "$tmp" -type=`logread "$tmp" 'type'` -if [ $# -gt 1 ]; then - file="$2" -else - file=`logread "$tmp" 'name'` -fi - -rvs "get.$type" "$id" "$file" - diff --git a/.files/etc/abomination/modules/rvs/get.d b/.files/etc/abomination/modules/rvs/get.d deleted file mode 100755 index 68d6aaa..0000000 --- a/.files/etc/abomination/modules/rvs/get.d +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# abomination module:rvs:get:d -name='rvs get.d' -ver='0.5.10' -usage='[OPTIONS] ID FILENAME' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -# get.d ID DIRNAME -id="$1" -dir="$2" - -tmp=`tempfile` -rvs get.f `logread "$db" 'hash'` "$tmp" - -mkdir "$dir" -for file in `cat "$tmp"`; do - hash=`echo "$file" | sed 's/^.*://'` - name=`echo "$file" | sed "s/:$hash$//"` - rvs get "$dir/$file" -done - -rm "$tmp" - diff --git a/.files/etc/abomination/modules/rvs/get.f b/.files/etc/abomination/modules/rvs/get.f deleted file mode 100755 index a0db378..0000000 --- a/.files/etc/abomination/modules/rvs/get.f +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# abomination module:rvs:get:f -name='rvs get.f' -ver='0.5.10' -usage='[OPTIONS] ID FILENAME' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -# get.f ID FILENAME -id="$1" -file="$2" - -cp "$repo/files/$id" "$file" - diff --git a/.files/etc/abomination/modules/rvs/init b/.files/etc/abomination/modules/rvs/init deleted file mode 100755 index ae778af..0000000 --- a/.files/etc/abomination/modules/rvs/init +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# abomination rvs init -name='rvs init' -ver='0.5.10' -usage='[OPTIONS]' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -source "`rvs -d`/lib/rvsdb" - -mkdir -p "$repo/{files/tmp}" - diff --git a/.files/etc/abomination/modules/rvs/lib/rvsdb b/.files/etc/abomination/modules/rvs/lib/rvsdb deleted file mode 100755 index 9763042..0000000 --- a/.files/etc/abomination/modules/rvs/lib/rvsdb +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash -# abomination module:rvs:lib:rvsdb -#name='rvs db' -#ver='0.5.10' -logver='0.5.0' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -source "`rvs -d`/lib/stdio" -#source "`rvs -d`/lib/rvsdb" - -repo='.rvs' - -# getid file -function getid { - #md5sum $file | sed "s/ .*$//" - sha1sum $file | sed "s/ .*$//" -} - -# loginit LOG -function loginit { - log="$1" - echo "#!rvsdb $logver" > "$log"; -} - -# lograw LOG -function lograw { - log="$1" - sed '1s/#!rvsdb .*//' "$log" -} - -# _find LOG FIELD VAL -function _find { - log="$1" - field="$2" - val="$3" - lograw $log | \ - cut -d : -f field | \ - sed -n "/^$val$/=" | \ - tr "\n" , | \ - sed 's/,$//' -} - -# logread LOG VAR -function logread { - log="$1" - var="$2" - lograw "$log" | sed -n "s/^$var://p" - #lograw "$log" | sed -n `_find "$log" '1' "$var"`p | cut -d : -f 2- -} - -# logwrite LOG VAR VAL -function logwrite { - log="$1" - var="$2" - val="$3" - - #lines=`_find "$log" '1' "$var"` - #if [ "$lines" = '' ]; then - if [ `lograw "$log" | grep "^$var:"` = '' ]; then - # no exiswhereting occurances - echo "$var:$val" >> "$log" - else - # found others - sed -i "^s/$var:.*/$var:$val/" "$log" - #lograw "$log" | ?????? - fi -} - -# logfind LOG VAL -function logfind { - log="$1" - val="$2" - # make a comma-delimeted list of the lines with our values - lines=`_find "$log" '2-' "$val"` - lograw "$log" | sed -n ${lines}p | cut -d : -f 1 -} - diff --git a/.files/etc/abomination/modules/rvs/lib/stdio b/.files/etc/abomination/modules/rvs/lib/stdio deleted file mode 100755 index 8e11b72..0000000 --- a/.files/etc/abomination/modules/rvs/lib/stdio +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# abomination module:rvs:lib:stdio -#name='rvs stdio' -#ver='0.5.9' -#usage='' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -#source "$RVSDIR/lib/stdio" -#source "$RVSDIR/lib/rvsdb" - -sopt='VhH?vq' -lopt='version,verbose,quiet,help' - -function verbose { - if [ "$volume" == '-v' ]; then - echo $@ - fi -} - -function out { - if [ "$volume" != '-q' ]; then - echo $@ - fi -} - -function version { - echo "$name $ver" - if [ "$volume" != '-q' ]; then - cat << __disclaimer__ -$name is copyright (C) 2009 Luke Shumaker -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. -__disclaimer__ - fi - exit 0 -} - -function error { - cat << __error__ -$name: $1 -Usage: $name $usage - -Try $name \`--help' for more options. -__error__ - exit 1 -} - diff --git a/.files/grub-2240-1.abm b/.files/grub-2240-1.abm deleted file mode 100644 index 3d5426d..0000000 --- a/.files/grub-2240-1.abm +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> - -<abomination> - <vcs id='GRUB' type='svn' commit='2240' url='http://svn.savannah.gnu.org/svn/grub/'> - <branch id='GRUB' url='grub/'> - <hist first='2' last='35' status='none' /> - <site url='http://www.uruk.org/grub/' /> - </branch> - <branch id='GNU GRUB' url='grub/'> - <site url='http://www.gnu.org/software/grub/' /> - <branch id='GRUB Legacy'> - <hist first='36' last='2240' status='inactive' /> - <site url='grub-legacy.en.html' /> - </branch> - <branch id='GRUB 2' url='grub2/'> - <hist first='2' last='35' status='active' /> - <site url='grub-2.en.html' /> - </branch> - </branch> - </vcs> -</abomination> - diff --git a/.files/grub.abm b/.files/grub.abm deleted file mode 100644 index 6b2d9cf..0000000 --- a/.files/grub.abm +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> - -<abomination type='svn' commit='2240' url='http://svn.savannah.gnu.org/svn/grub/'> - <branch id='GRUB'> - <branch id='GRUB'> - <co dir='grub' /> - <hist first='2' last='35' status='none' /> - <site url='http://www.uruk.org/grub/' /> - </branch> - <branch id='GNU GRUB'> - <site url='http://www.gnu.org/software/grub/' /> - <branch id='GRUB Legacy'> - <co dir='grub' /> - <hist first='36' last='2240' status='inactive' /> - <site url='http://www.gnu.org/software/grub/grub-legacy.en.html' /> - </branch> - <branch id='GRUB 2'> - <co dir='grub2' /> - <hist first='2' last='35' status='active' /> - <site url='http://www.gnu.org/software/grub/grub-2.en.html' /> - </branch> - </branch> - </branch> -</abomination> - diff --git a/.files/pget b/.files/pget deleted file mode 120000 index 5eafac9..0000000 --- a/.files/pget +++ /dev/null @@ -1 +0,0 @@ -.pget/pget-wch
\ No newline at end of file diff --git a/.files/rvs-0.5.10.tar b/.files/rvs-0.5.10.tar Binary files differdeleted file mode 100644 index d6b2bff..0000000 --- a/.files/rvs-0.5.10.tar +++ /dev/null diff --git a/.files/rvs-0.5.10.tar.gz.bak b/.files/rvs-0.5.10.tar.gz.bak Binary files differdeleted file mode 100644 index d6b2bff..0000000 --- a/.files/rvs-0.5.10.tar.gz.bak +++ /dev/null diff --git a/.files/rvs-0.8c.tar.gz b/.files/rvs-0.8c.tar.gz Binary files differdeleted file mode 100644 index 33b354c..0000000 --- a/.files/rvs-0.8c.tar.gz +++ /dev/null diff --git a/.files/rvs-pre-bzr.tar b/.files/rvs-pre-bzr.tar Binary files differdeleted file mode 100644 index c5a5ab4..0000000 --- a/.files/rvs-pre-bzr.tar +++ /dev/null diff --git a/.files/rvs-pre-bzr.tar.gz.bak b/.files/rvs-pre-bzr.tar.gz.bak Binary files differdeleted file mode 100644 index e6622e1..0000000 --- a/.files/rvs-pre-bzr.tar.gz.bak +++ /dev/null diff --git a/.files/usr/bin/rvs b/.files/usr/bin/rvs deleted file mode 100755 index f8f31c6..0000000 --- a/.files/usr/bin/rvs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# abomination module:rvs -name='rvs' -ver='0.5.10' -usage='COMMAND [OPTIONS]' -# Copyright (C) 2009 Luke Shumaker -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>. - -RVSDIR='/etc/abomination/modules/rvs' -source "$RVSDIR/lib/stdio" -source "$RVSDIR/lib/rvsdb" - -com=$1; -case "$com" in - -d) echo "$RVSDIR";; - '') error 'please specify a command';; - *) - if [ -f "$RVSDIR/$com" ]; then - export TMPDIR="$repo/tmp" - $RVSDIR/$@ - else - error "unrecognized command \`$com'" - fi - :;; -esac - -#args=`getopt -n "$name" -o "${sopt}" -l "${lopt}" -- "$@"` -#if [ $? == 0 ]; then -# set -- $args -# while [ $# -gt 0 ]; do -# case "$1" in -# -V | --version) mode='version';; -# -h | -H | -\? | --help) mode='help';; -# -# -v | --verbose) volume='-v';; -# -q | --quiet) volume='-q';; -# -# --) shift; break;; -# esac -# shift; -# done -#else -# error -#fi - |