From 8eefcad20d2254166483e10803c6e2fe90b4f3d5 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 19 Dec 2016 21:54:51 -0500 Subject: [PATCH] cleaning some cruft out --- documentation/doc_fodder/perl_tools.html | 7 +--- scripts/core/common.alias | 1 - scripts/rev_control/compact_git.sh | 3 ++ scripts/rev_control/cvs_fix.pl | 45 ------------------------ scripts/rev_control/fix_svn_item.sh | 4 ++- 5 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 scripts/rev_control/cvs_fix.pl diff --git a/documentation/doc_fodder/perl_tools.html b/documentation/doc_fodder/perl_tools.html index 4c4ce4d0..8eaad288 100644 --- a/documentation/doc_fodder/perl_tools.html +++ b/documentation/doc_fodder/perl_tools.html @@ -186,12 +186,7 @@ or changed files in the destination directory to be more recent than anything else in there.  This is helpful sometimes for forcing compilation of modified source files.
-

-

cvs_fix.pl

-
Wraps the cygwin cvs command for pcdos/win32. - Any -unfriendly backward slashes are flipped to be forward slashes.
-
+

differ.pl

diff --git a/scripts/core/common.alias b/scripts/core/common.alias index 2114d4b0..a830e601 100644 --- a/scripts/core/common.alias +++ b/scripts/core/common.alias @@ -15,7 +15,6 @@ define_yeti_alias cls='clear_colormap; clear' define_yeti_alias copy='\cp -i -v ' define_yeti_alias cp='\cp -i -v ' -define_yeti_alias cvs='perl $FEISTY_MEOW_SCRIPTS/rev_control/cvs_fix.pl' define_yeti_alias del='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl' define_yeti_alias deltree='perl $FEISTY_MEOW_SCRIPTS/files/safedel.pl' define_yeti_alias df='\df -mh' diff --git a/scripts/rev_control/compact_git.sh b/scripts/rev_control/compact_git.sh index abc626a5..88efcdaa 100644 --- a/scripts/rev_control/compact_git.sh +++ b/scripts/rev_control/compact_git.sh @@ -7,6 +7,9 @@ fi pushd "$prune_dir" echo cleaning git in directory $(pwd) git fsck --full +check_if_failed "git fsck" git gc --prune=today --aggressive +check_if_failed "git gc" git repack +check_if_failed "git repack" popd diff --git a/scripts/rev_control/cvs_fix.pl b/scripts/rev_control/cvs_fix.pl deleted file mode 100644 index 4cee4be6..00000000 --- a/scripts/rev_control/cvs_fix.pl +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/perl - -############################################################################### -# # -# Name : cvs_fix # -# Author : Chris Koeritz # -# Rights : Copyright (C) 2001-$now by Author # -# # -# Purpose: # -# # -# Flips any win32 slashes into friendly forward slashes before running # -# the cvs binary. # -# # -############################################################################### -# 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 2 of the License or (at your option) # -# any later version. See: "http://www.gruntose.com/Info/GNU/GPL.html" for a # -# version of the License. Please send any updates to "fred@gruntose.com". # -############################################################################### - -#require "filename_helper.pl"; - -$new_cmd="cvs"; - -foreach $i (@ARGV) { -# printf "$i\n"; - $i =~ s/[\/\\]*$//; - $i =~ s/\\/\//g; -# print " --> $i\n"; - if ($i =~ /^co$/) { - # insert our modifiers here. - $new_cmd = $new_cmd . " " . $i . " -P -kb "; - } else { - # normal addition of next parameter. - $new_cmd = $new_cmd . " " . $i; - } -} - -#printf "new command is: \"$new_cmd\"\n"; -#printf "are the -P and -kb flags in there?\n"; -system("$new_cmd"); - -1; - diff --git a/scripts/rev_control/fix_svn_item.sh b/scripts/rev_control/fix_svn_item.sh index 64eabaa5..941e5729 100644 --- a/scripts/rev_control/fix_svn_item.sh +++ b/scripts/rev_control/fix_svn_item.sh @@ -5,4 +5,6 @@ filename="$1"; shift -svn resolve --accept=working "$filename" +svn resolve --accept=working "$filename" + + -- 2.34.1