diff -rc2P git-4.3.14/LSM /home/tudor/src/git/git-4.3.15/LSM *** git-4.3.14/LSM Tue Dec 3 21:47:21 1996 --- /home/tudor/src/git/git-4.3.15/LSM Mon Dec 23 20:59:50 1996 *************** *** 1,6 **** Begin3 Title: GNU Interactive Tools ! Version: 4.3.14 ! Entered-date: 3Dec96 Description: GIT is a portable file system browser for UNIX systems. An interactive process viewer/killer, a hex/ascii file --- 1,6 ---- Begin3 Title: GNU Interactive Tools ! Version: 4.3.15 ! Entered-date: 23Dec96 Description: GIT is a portable file system browser for UNIX systems. An interactive process viewer/killer, a hex/ascii file *************** *** 13,19 **** pink@pub.ro (Andrei Pitis) Maintained-by: tudor@cs.unh.edu (Tudor Hulubei) ! Primary-site: ftp.cs.unh.edu /pub/gnu/git ! 370k git-4.3.14.tar.gz ! 929 git-4.3.14.lsm Alternate-site: prep.ai.mit.edu /pub/gnu Original-site: --- 13,19 ---- pink@pub.ro (Andrei Pitis) Maintained-by: tudor@cs.unh.edu (Tudor Hulubei) ! Primary-site: ftp.cs.unh.edu /pub/grads/tudor/git ! 374k git-4.3.15.tar.gz ! 938 git-4.3.15.lsm Alternate-site: prep.ai.mit.edu /pub/gnu Original-site: diff -rc2P git-4.3.14/Makefile.in /home/tudor/src/git/git-4.3.15/Makefile.in *** git-4.3.14/Makefile.in Mon Dec 2 19:07:24 1996 --- /home/tudor/src/git/git-4.3.15/Makefile.in Sat Dec 21 23:39:59 1996 *************** *** 132,135 **** --- 132,136 ---- clean: -rm -f *.o *~ core* tutu* gogu* .gdb_history prefix.new + -rm -f 2hyphens \ for dir in $(SUBDIRS);\ diff -rc2P git-4.3.14/NEWS /home/tudor/src/git/git-4.3.15/NEWS *** git-4.3.14/NEWS Tue Dec 3 20:37:48 1996 --- /home/tudor/src/git/git-4.3.15/NEWS Mon Dec 23 16:45:58 1996 *************** *** 8,11 **** --- 8,53 ---- ----------- + Version 4.3.15 + .............. + + - MIME-PACK, B-MIME-PACK, MIME-UNPACK, B-MIME-UNPACK - new user + defined commands that pack/unpack mime files. The corresponding key + bindings are: ^Ck, ^Cbk, ^CK and ^CbK. The mpack package should + be installed in order for these to work. + + - MIME-MAIL, B-MIME-MAIL - new user defined commands that can send + files by mail as mime messages. The corresponding key bindings are: + ^C2m and ^Cb2m. The mpack package is required for these ones as well. + + - FAST-DIFF - new user defined command (on ^Cfd). Calls diff -r -q + and reports differences between directories in terms of files that + differ, but does not report the actual differences between them. + + - Added support for *.mov to gitaction. + + - Added support for bin packing (i.e. packing files in the smallest + number of bins). See the info documentation for details. + + - Some user defined commands now protect "weird" file names with the + POSIX specified `--' argument that terminates all options. Thus for + some commands the errors that used to occur when dealing with file + names beginning with a hyphen are now fixed, depending on whether or + not that particular command supports the `--' argument. For the + ones that don't (emacs, ghostview, tar, basename, ar, xv, xanim, + xfig, lynx, mpeg_play, zip/unzip, ispell, etc), there is nothing I + can do. git cannot check whether or not programs actually do + support this POSIX feature. + + - `git' now works with gzip only. Support for `compress' as an + alternative has been removed. Most archives today are in `gzip' + format anyway. + + - Multiple patterns are accepted on `select-files-matching-pattern'. + The patterns are separated by spaces. Spaces and \s should be + escaped with a \ if part of the pattern. + + - Bug fixes. + + Version 4.3.14 .............. diff -rc2P git-4.3.14/PLATFORMS /home/tudor/src/git/git-4.3.15/PLATFORMS *** git-4.3.14/PLATFORMS Mon Nov 11 17:18:12 1996 --- /home/tudor/src/git/git-4.3.15/PLATFORMS Mon Dec 23 20:55:43 1996 *************** *** 34,45 **** 25. alpha OSF1 V1.2 alpha-dec-axposf1.2 26. alpha OSF1 V3.2 alpha-dec-osf3.2 ! 27. hp300 NetBSD 1.0A m68k-hp-netbsd1.0A ! 28. mk68k NetBSD 1.2 m68k-cbm-netbsd1.2 ! 29. m68k BSD 4.3 m68k-hp-bsd ! 30. i386 Minix 1.16.25.1 i386-vu-minix ! 31. m68k sysV68 R3V7.1 m68k-motorola-sysv ! 32. NeXT Next Step 3.2 m68k-next-nextstep3 ! 33. m68k B.O.S. 02.01 m68k-bull-sysv3 ! 34. ??? qnx 4.22 ???-???-??? ! 35. we32k AT&T 3B2 we32k-att-sysv3 ! 36. i486 SCO 3.2 V 4.2 i486-unknown-sco3.2 --- 34,46 ---- 25. alpha OSF1 V1.2 alpha-dec-axposf1.2 26. alpha OSF1 V3.2 alpha-dec-osf3.2 ! 27. alpha OSF1 V4.0 alpha-dec-osf4.0 ! 28. hp300 NetBSD 1.0A m68k-hp-netbsd1.0A ! 29. mk68k NetBSD 1.2 m68k-cbm-netbsd1.2 ! 30. m68k BSD 4.3 m68k-hp-bsd ! 31. i386 Minix 1.16.25.1 i386-vu-minix ! 32. m68k sysV68 R3V7.1 m68k-motorola-sysv ! 33. NeXT Next Step 3.2 m68k-next-nextstep3 ! 34. m68k B.O.S. 02.01 m68k-bull-sysv3 ! 35. ??? qnx 4.22 ???-???-??? ! 36. we32k AT&T 3B2 we32k-att-sysv3 ! 37. i486 SCO 3.2 V 4.2 i486-unknown-sco3.2 diff -rc2P git-4.3.14/README /home/tudor/src/git/git-4.3.15/README *** git-4.3.14/README Sat Sep 28 18:33:59 1996 --- /home/tudor/src/git/git-4.3.15/README Fri Dec 20 16:01:57 1996 *************** *** 43,54 **** 2. There are many configuration files in GIT: ! a. .gitrc.generic - generic configuration file ! b. .gitrc.linux - Linux console configuration file ! c. .gitrc.vt100 - vt100 configuration file ! d. .gitrc.vt102 - vt102 configuration file (same as vt100) ! e. .gitrc.xterm - xterm configuration file ! f. .gitrc.hpterm - hpterm configuration file ! g. .gitrc.aixterm - aixterm configuration file ! h. .gitrc.thix - thix configuration file ..... etc. --- 43,59 ---- 2. There are many configuration files in GIT: ! a. .gitrc.generic - generic configuration file ! b. .gitrc.linux - Linux console configuration file ! c. .gitrc.vt100 - vt100 configuration file ! d. .gitrc.vt102 - vt102 configuration file (same as vt100) ! e. .gitrc.xterm - xterm configuration file ! f. .gitrc.xterm-color - xterm configuration file ! g. .gitrc.hpterm - hpterm configuration file ! h. .gitrc.aixterm - aixterm configuration file ! i. .gitrc.hft - hft configuration file ! j. .gitrc.thix - thix configuration file ! k. .gitrc.ansi - ansi configuration file ! l. .gitrc.minix - minix configuration file ! m. .gitrc.mach - mach configuration file (for the GNU Hurd) ..... etc. diff -rc2P git-4.3.14/configure /home/tudor/src/git/git-4.3.15/configure *** git-4.3.14/configure Tue Dec 3 23:34:15 1996 --- /home/tudor/src/git/git-4.3.15/configure Mon Dec 23 16:40:45 1996 *************** *** 1,5 **** #! /bin/sh ! # From configure.in Revision: 4.3.14 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 --- 1,5 ---- #! /bin/sh ! # From configure.in Revision: 4.3.15 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 *************** *** 530,534 **** PRODUCT="GNU Interactive Tools" ! VERSION="4.3.14" --- 530,534 ---- PRODUCT="GNU Interactive Tools" ! VERSION="4.3.15" *************** *** 537,541 **** echo echo " ############################################" ! echo " # Configuring GNU Interactive Tools 4.3.14 #" echo " ############################################" echo --- 537,541 ---- echo echo " ############################################" ! echo " # Configuring GNU Interactive Tools 4.3.15 #" echo " ############################################" echo *************** *** 4016,4020 **** if test "$TERMINFO" = "no"; then ! if test "$host_os" = "solaris2.3" -o "$host_os" = "solaris2.4"; then echo $ac_n "checking for tgetent in -lucb""... $ac_c" 1>&6 echo "configure:4021: checking for tgetent in -lucb" >&5 --- 4016,4020 ---- if test "$TERMINFO" = "no"; then ! if test "$host_os" = "solaris2.3" || test "$host_os" = "solaris2.4"; then echo $ac_n "checking for tgetent in -lucb""... $ac_c" 1>&6 echo "configure:4021: checking for tgetent in -lucb" >&5 diff -rc2P git-4.3.14/configure.in /home/tudor/src/git/git-4.3.15/configure.in *** git-4.3.14/configure.in Tue Dec 3 23:33:46 1996 --- /home/tudor/src/git/git-4.3.15/configure.in Mon Dec 23 16:37:08 1996 *************** *** 3,7 **** dnl ########################################################################### dnl # # ! dnl # Autoconf input file for GNU Interactive Tools 4.3.14 # dnl # Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. # dnl # # --- 3,7 ---- dnl ########################################################################### dnl # # ! dnl # Autoconf input file for GNU Interactive Tools 4.3.15 # dnl # Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. # dnl # # *************** *** 13,17 **** dnl ############################### ! AC_REVISION($Revision: 4.3.14 $) AC_INIT(src/git.c) AC_CONFIG_HEADER(config.h) --- 13,17 ---- dnl ############################### ! AC_REVISION($Revision: 4.3.15 $) AC_INIT(src/git.c) AC_CONFIG_HEADER(config.h) *************** *** 24,28 **** PRODUCT="GNU Interactive Tools" ! VERSION="4.3.14" --- 24,28 ---- PRODUCT="GNU Interactive Tools" ! VERSION="4.3.15" *************** *** 34,38 **** echo echo " ############################################" ! echo " # Configuring GNU Interactive Tools 4.3.14 #" echo " ############################################" echo --- 34,38 ---- echo echo " ############################################" ! echo " # Configuring GNU Interactive Tools 4.3.15 #" echo " ############################################" echo *************** *** 713,717 **** if test "$TERMINFO" = "no"; then ! if test "$host_os" = "solaris2.3" -o "$host_os" = "solaris2.4"; then AC_CHECK_LIB(ucb, tgetent, , , $LIBS) fi --- 713,717 ---- if test "$TERMINFO" = "no"; then ! if test "$host_os" = "solaris2.3" || test "$host_os" = "solaris2.4"; then AC_CHECK_LIB(ucb, tgetent, , , $LIBS) fi diff -rc2P git-4.3.14/git.spec /home/tudor/src/git/git-4.3.15/git.spec *** git-4.3.14/git.spec Tue Dec 3 15:13:12 1996 --- /home/tudor/src/git/git-4.3.15/git.spec Fri Dec 20 15:57:33 1996 *************** *** 1,9 **** Summary: GIT - GNU Interactive Tools Name: git ! Version: 4.3.14 Release: 1 Copyright: GPL Group: Utilities/File ! Source: prep.ai.mit.edu:/pub/gnu/git-4.3.14.tar.gz %description --- 1,9 ---- Summary: GIT - GNU Interactive Tools Name: git ! Version: 4.3.15 Release: 1 Copyright: GPL Group: Utilities/File ! Source: prep.ai.mit.edu:/pub/gnu/git-4.3.15.tar.gz %description *************** *** 38,42 **** /usr/bin/gitmount /usr/bin/gitaction - /usr/bin/gitredir /usr/bin/gitrgrep /usr/bin/gitxgrep --- 38,41 ---- *************** *** 49,53 **** /usr/man/man1/gitmount.1 /usr/man/man1/gitkeys.1 - /usr/man/man1/gitredir.1 /usr/man/man1/gitrgrep.1 /usr/man/man1/gitps.1 --- 48,51 ---- diff -rc2P git-4.3.14/info/git.info /home/tudor/src/git/git-4.3.15/info/git.info *** git-4.3.14/info/git.info Tue Dec 3 20:46:17 1996 --- /home/tudor/src/git/git-4.3.15/info/git.info Sun Dec 22 20:35:18 1996 *************** *** 29,34 **** Indirect: git.info-1: 1038 ! git.info-2: 50741 ! git.info-3: 94982  Tag Table: --- 29,34 ---- Indirect: git.info-1: 1038 ! git.info-2: 51037 ! git.info-3: 95938  Tag Table: *************** *** 38,158 **** Node: Distrib3220 Node: Description4897 ! Node: git5764 ! Node: Conventions8217 ! Node: Modes10117 ! Node: Sorting12357 ! Node: Moving13603 ! Node: Selecting15003 ! Node: Isearch15550 ! Node: Input Line16648 ! Node: Inserting Text17697 ! Node: Moving Point18583 ! Node: Erasing19144 ! Node: Case Changes20371 ! Node: History20780 ! Node: Setting Mark21496 ! Node: Yanking21807 ! Node: Files22036 ! Node: Copying Files23503 ! Node: Moving Files23847 ! Node: Creating Files24212 ! Node: Deleting Files24556 ! Node: Linking Files24878 ! Node: Renaming Files25503 ! Node: Inode26052 ! Node: Editing Files27689 ! Node: Viewing Files28389 ! Node: Compressing Files28758 ! Node: Encoding Files29544 ! Node: Encrypting Files30031 ! Node: Comparing Files30298 ! Node: Comparing Directories31375 ! Node: Spelling Files31935 ! Node: Wiping Files32156 ! Node: Searching Files32470 ! Node: Archive Files32981 ! Node: RPM Packages34223 ! Node: MSDOS Files35570 ! Node: Actions37599 ! Node: Directories38507 ! Node: Creating Dirs39194 ! Node: Copying Dirs39448 ! Node: Deleting Dirs39904 ! Node: Moving Dirs40317 ! Node: Renaming Dirs40770 ! Node: Dirs Usage41183 ! Node: Changing Dirs41435 ! Node: Dirs History42085 ! Node: Hot Keys43128 ! Node: Compiling43716 ! Node: Mail44069 ! Node: Shell44787 ! Node: Grep45056 ! Node: Locking45461 ! Node: Refreshing45839 ! Node: Reseting46858 ! Node: Mounting47088 ! Node: Sysinfo49129 ! Node: Environment50356 ! Node: Processes50741 ! Node: Sync52804 ! Node: Documentation53036 ! Node: Exit53352 ! Node: gitps53551 ! Node: gitview54205 ! Node: gitkeys54714 ! Node: gitwipe55090 ! Node: gitmount55787 ! Node: gitaction56389 ! Node: gitredir58674 ! Node: gitrgrep59848 ! Node: Customization60347 ! Node: Environment Variables60640 ! Node: Configuration Files61678 ! Node: Key Sequences64473 ! Node: Setup65791 ! Node: git Sections66823 ! Node: GIT-Setup67247 ! Node: GIT-Color69362 ! Node: GIT-Monochrome69703 ! Node: GIT-Keys70077 ! Node: key-sequence70964 ! Node: command-name71587 ! Node: formatted-command72313 ! Node: %s73622 ! Node: %f74132 ! Node: %d74360 ! Node: %l74588 ! Node: %t74822 ! Node: %z75038 ! Node: %a75250 ! Node: %m75446 ! Node: %g75631 ! Node: %o75817 ! Node: %p76003 ! Node: %b76189 ! Node: %i76385 ! Node: %?76591 ! Node: new-dir77063 ! Node: save-screen77470 ! Node: pause78149 ! Node: hide78463 ! Node: GIT-FTI79240 ! Node: gitps Sections79803 ! Node: GITPS-Setup80181 ! Node: GITPS-Color80340 ! Node: GITPS-Monochrome80692 ! Node: GITPS-Keys81080 ! Node: gitview Sections81192 ! Node: GITVIEW-Setup81561 ! Node: GITVIEW-Color81730 ! Node: GITVIEW-Monochrome82096 ! Node: GITVIEW-Keys82498 ! Node: Limitations82616 ! Node: Bugs83911 ! Node: Key Index84149 ! Node: Command Index94982 ! Node: Variable Index106124 ! Node: Concept Index107409  End Tag Table --- 38,158 ---- Node: Distrib3220 Node: Description4897 ! Node: git5684 ! Node: Conventions8137 ! Node: Modes10037 ! Node: Sorting12277 ! Node: Moving13523 ! Node: Selecting14923 ! Node: Isearch15555 ! Node: Input Line16653 ! Node: Inserting Text17702 ! Node: Moving Point18588 ! Node: Erasing19149 ! Node: Case Changes20376 ! Node: History20785 ! Node: Setting Mark21501 ! Node: Yanking21812 ! Node: Files22041 ! Node: Copying Files23520 ! Node: Moving Files23864 ! Node: Creating Files24229 ! Node: Deleting Files24573 ! Node: Linking Files24895 ! Node: Renaming Files25520 ! Node: Packing Files26077 ! Node: Inode26884 ! Node: Editing Files28508 ! Node: Viewing Files29208 ! Node: Compressing Files29577 ! Node: Encoding Files30363 ! Node: Encrypting Files31262 ! Node: Comparing Files31529 ! Node: Spelling Files32161 ! Node: Wiping Files32376 ! Node: Searching Files32690 ! Node: Archive Files33201 ! Node: RPM Packages34443 ! Node: MSDOS Files35790 ! Node: Actions37819 ! Node: Directories38727 ! Node: Creating Dirs39474 ! Node: Copying Dirs39728 ! Node: Deleting Dirs40184 ! Node: Moving Dirs40597 ! Node: Renaming Dirs41050 ! Node: Comparing Dirs41467 ! Node: Dirs Usage42666 ! Node: Changing Dirs42919 ! Node: Dirs History43569 ! Node: Hot Keys44612 ! Node: Compiling45200 ! Node: Mail45578 ! Node: Shell46695 ! Node: Grep46964 ! Node: Locking47369 ! Node: Refreshing47747 ! Node: Reseting48766 ! Node: Mounting48996 ! Node: Sysinfo51037 ! Node: Environment52264 ! Node: Processes52649 ! Node: Sync54712 ! Node: Documentation54944 ! Node: Exit55260 ! Node: gitps55459 ! Node: gitview56113 ! Node: gitkeys56622 ! Node: gitwipe56998 ! Node: gitmount57695 ! Node: gitaction58297 ! Node: gitrgrep60582 ! Node: Customization61082 ! Node: Environment Variables61375 ! Node: Configuration Files62334 ! Node: Key Sequences65129 ! Node: Setup66447 ! Node: git Sections67479 ! Node: GIT-Setup67903 ! Node: GIT-Color70018 ! Node: GIT-Monochrome70359 ! Node: GIT-Keys70733 ! Node: key-sequence71620 ! Node: command-name72243 ! Node: formatted-command72969 ! Node: %s74278 ! Node: %f74788 ! Node: %d75016 ! Node: %l75244 ! Node: %t75478 ! Node: %z75694 ! Node: %a75906 ! Node: %m76102 ! Node: %g76287 ! Node: %o76473 ! Node: %p76659 ! Node: %b76845 ! Node: %i77041 ! Node: %?77247 ! Node: new-dir77719 ! Node: save-screen78126 ! Node: pause78805 ! Node: hide79119 ! Node: GIT-FTI79896 ! Node: gitps Sections80459 ! Node: GITPS-Setup80837 ! Node: GITPS-Color80996 ! Node: GITPS-Monochrome81348 ! Node: GITPS-Keys81736 ! Node: gitview Sections81848 ! Node: GITVIEW-Setup82217 ! Node: GITVIEW-Color82386 ! Node: GITVIEW-Monochrome82752 ! Node: GITVIEW-Keys83154 ! Node: Limitations83272 ! Node: Bugs84568 ! Node: Key Index84806 ! Node: Command Index95938 ! Node: Variable Index107491 ! Node: Concept Index108713  End Tag Table diff -rc2P git-4.3.14/info/git.info-1 /home/tudor/src/git/git-4.3.15/info/git.info-1 *** git-4.3.14/info/git.info-1 Tue Dec 3 20:46:17 1996 --- /home/tudor/src/git/git-4.3.15/info/git.info-1 Sun Dec 22 20:35:17 1996 *************** *** 31,35 **** `GIT' is a package containing basically a file system browser, a process viewer/killer and a ASCII/HEX file viewer. This is edition ! 2.5, for GNU Interactive Tools version 4.3.14. * Menu: --- 31,35 ---- `GIT' is a package containing basically a file system browser, a process viewer/killer and a ASCII/HEX file viewer. This is edition ! 2.5, for GNU Interactive Tools version 4.3.15. * Menu: *************** *** 125,129 **** * gitmount:: A script for mounting file systems. * gitaction:: A per file type action script. - * gitredir:: A internal stdout to stderr redirection script. * gitrgrep:: A recursive grep script. --- 125,128 ---- *************** *** 404,410 **** `^C s' ! Select (marks) all the files matching a pattern ! (`select-files-matching-pattern'). The user will be prompted for a ! pattern to match against. `^C u' --- 403,410 ---- `^C s' ! Select (marks) all the files matching at least one pattern from a ! space separated list of shell patterns. Spaces and \s are allowed in ! the patterns but they have to be escaped with a \. ! (`select-files-matching-pattern'). `^C u' *************** *** 633,645 **** * Linking Files:: How to create hard and symbolic links. * Renaming Files:: How to rename files. ! * Inode:: How to change a file inode mode, owner, group. * Editing Files:: How to edit and create files. Default editor. * Viewing Files:: How to view files. Default viewer. * Compressing Files:: How to compress and decompress files. ! * Encoding Files:: How to uuencode/uudecode a file. * Encrypting Files:: How to encrypt/decrypt files with pgp. * Comparing Files:: How to compare two files. - * Comparing Directories:: How to compare the files in two directories. * Spelling Files:: How to spell a file. * Wiping Files:: How to wipe a file. --- 633,645 ---- * Linking Files:: How to create hard and symbolic links. * Renaming Files:: How to rename files. ! * Packing Files:: How to pack files in the min. number of bins. ! * Inode:: How to change a file's mode, owner, group. * Editing Files:: How to edit and create files. Default editor. * Viewing Files:: How to view files. Default viewer. * Compressing Files:: How to compress and decompress files. ! * Encoding Files:: How to uuencode/uudecode, mpack/munpack a file. * Encrypting Files:: How to encrypt/decrypt files with pgp. * Comparing Files:: How to compare two files. * Spelling Files:: How to spell a file. * Wiping Files:: How to wipe a file. *************** *** 725,729 ****  ! File: git.info, Node: Renaming Files, Next: Inode, Prev: Linking Files, Up: Files Renaming Files --- 725,729 ----  ! File: git.info, Node: Renaming Files, Next: Packing Files, Prev: Linking Files, Up: Files Renaming Files *************** *** 747,755 ****  ! File: git.info, Node: Inode, Next: Editing Files, Prev: Renaming Files, Up: Files ! Changing a file's inode mode, owner and group ............................................. `^C M' Change the mode of the currently selected entries (`CHMOD'). --- 747,775 ----  ! File: git.info, Node: Packing Files, Next: Inode, Prev: Renaming Files, Up: Files ! Packing files into the minimum number of bins ............................................. + `^C ~' + Pack the files into the smallest number of bins. This is in fact an + approximation, since the problem is NP-complete and no known algorithm + can guarantee a solution better than `(11/9) * OPTIMAL + 4'. + + To make things even worst, it is generally difficult to figure out the + file system block size for the target bin. Asking the user is not a + good idea either. `git' currently assumes a file system block size + of 1Kb. + + Bin packing can be useful when you want to put a bunch of files on + floppies and you want to optimize things a little bit + (`bin-packing'). + +  + File: git.info, Node: Inode, Next: Editing Files, Prev: Packing Files, Up: Files + + Changing a file's mode, owner and group + ....................................... + `^C M' Change the mode of the currently selected entries (`CHMOD'). *************** *** 887,890 **** --- 907,924 ---- background (`B-UUDECODE'). + `^C k' + Encode the currently selected file using mpack (`MIME-PACK'). + + `^C b k' + Encode the currently selected file using mpack. The operation is + performed in background (`B-MIME-PACK'). + + `^C K' + Decode the currently selected file using munpack (`MIME-UNPACK'). + + `^C b K' + Decode the currently selected file using munpack. The operation is + performed in background (`B-MIME-UNPACK'). +  File: git.info, Node: Encrypting Files, Next: Comparing Files, Prev: Encoding Files, Up: Files *************** *** 900,904 ****  ! File: git.info, Node: Comparing Files, Next: Comparing Directories, Prev: Encrypting Files, Up: Files Comparing Files --- 934,938 ----  ! File: git.info, Node: Comparing Files, Next: Spelling Files, Prev: Encrypting Files, Up: Files Comparing Files *************** *** 906,911 **** `^C =' ! Compare (using `diff') the current ASCII file with the other panel ! current file (`DIFF'). If both entries are directories, a recursive diff is performed. --- 940,945 ---- `^C =' ! Compare (using `diff') the current ASCII file with the other ! panel's current file (`DIFF'). If both entries are directories, a recursive diff is performed. *************** *** 915,929 **** the end (`LAST-BACKUP-DIFF'). - `^C d' - Compare (using `diff') the current directory with the other panel - current directory. For successful operation, both panels should contain - the same directory (`DIR-DIFF'). - - `^C b d' - Compare (using `diff') the current directory with the other panel - current directory. For successful operation, both panels should contain - the same directory. The operation is performed in background - (`DIR-DIFF'). - `^C B' Compare the current file with the other panel current file. A binary --- 949,952 ---- *************** *** 931,951 ****  ! File: git.info, Node: Comparing Directories, Next: Spelling Files, Prev: Comparing Files, Up: Files ! ! Comparing Directories ! ..................... ! ! `^C c q' ! Quickly compare the files in the left panel with the files in the right ! one. Only the file names, sizes and time stamps are considered in the ! comparison. ! ! `^C c t' ! Compare the files in the left panel with the files in the right one. ! The contents of each file in the current panel will be compared against ! the contents of its couterpart (if any) from the other panel. ! !  ! File: git.info, Node: Spelling Files, Next: Wiping Files, Prev: Comparing Directories, Up: Files Spelling Files --- 954,958 ----  ! File: git.info, Node: Spelling Files, Next: Wiping Files, Prev: Comparing Files, Up: Files Spelling Files *************** *** 1176,1179 **** --- 1183,1187 ---- * Moving Dirs:: How to move directories. * Renaming Dirs:: How to rename directories. + * Comparing Dirs:: How to compare directories. * Dirs Usage:: Summarize directory usage. * Changing Dirs:: How to go to a new directory. *************** *** 1236,1240 ****  ! File: git.info, Node: Renaming Dirs, Next: Dirs Usage, Prev: Moving Dirs, Up: Directories Renaming directories --- 1244,1248 ----  ! File: git.info, Node: Renaming Dirs, Next: Comparing Dirs, Prev: Moving Dirs, Up: Directories Renaming directories *************** *** 1250,1254 ****  ! File: git.info, Node: Dirs Usage, Next: Changing Dirs, Prev: Renaming Dirs, Up: Directories Summarize directory usage --- 1258,1294 ----  ! File: git.info, Node: Comparing Dirs, Next: Dirs Usage, Prev: Renaming Dirs, Up: Directories ! ! Comparing Directories ! ..................... ! ! `^C c q' ! Quickly compare the files in the left panel with the files in the right ! one. Only the file names, sizes and time stamps are considered in the ! comparison. ! ! `^C c t' ! Compare the files in the left panel with the files in the right one. ! The contents of each file in the current panel will be compared against ! the contents of its couterpart (if any) from the other panel. ! ! `^C f d' ! Recursively compare (using `diff -r -q') the current directory with ! the other panel's current directory (`FAST-DIFF'). Print on ! standard output the names of the files that differ. ! ! `^C d' ! Compare (using `diff') the current directory with the other panel ! current directory. For successful operation, both panels should contain ! the same directory (`DIR-DIFF'). ! ! `^C b d' ! Compare (using `diff') the current directory with the other panel ! current directory. For successful operation, both panels should contain ! the same directory. The operation is performed in background ! (`DIR-DIFF'). ! !  ! File: git.info, Node: Dirs Usage, Next: Changing Dirs, Prev: Comparing Dirs, Up: Directories Summarize directory usage *************** *** 1344,1351 **** `F9', `ESC 9', `^X m' Run the `make' command in the current directory. Use -k as the ! default option. `^X b m' ! Run the `make' command in background in the current directory. *Note gitaction::, for more information. --- 1384,1392 ---- `F9', `ESC 9', `^X m' Run the `make' command in the current directory. Use -k as the ! default option (`MAKE'). `^X b m' ! Run the `make' command in background in the current directory ! (`B-MAKE'). *Note gitaction::, for more information. *************** *** 1358,1378 **** `^C 2 a' Send the current current ascii file by mail to an user supplied email ! address. `^C b 2 a' ! The same as above, the only difference being that the command runs in ! background. `^C 2 b' ! Send the current current binary file by mail to an user supplied email ! address. The file is uuencoded first. `^C b 2 b' ! The same as above, the only difference being that the command runs in ! background. `ESC x r m' Run the `emacs -f rmail' command. This will start the Emacs's ! `rmail' function so that you can read your mail.  --- 1399,1428 ---- `^C 2 a' Send the current current ascii file by mail to an user supplied email ! address (`ASCII-MAIL'). `^C b 2 a' ! The same as `ASCII-MAIL', the only difference being that the ! command runs in background (`B-ASCII-MAIL'). `^C 2 b' ! Send the current current binary file by mail to an user supplied list of ! email addresses. The file is uuencoded first (`BINARY-MAIL'). `^C b 2 b' ! The same as `BINARY-MAIL', the only difference being that the ! command runs in background (`B-BINARY-MAIL'). ! ! `^C 2 m' ! Send the current current binary file by mail to an user supplied list of ! email addresses. The file is encoded with mpack first ! (`MIME-MAIL'). ! ! `^C b 2 m' ! The same as `MIME-MAIL', the only difference being that the command ! runs in background (`B-MIME-MAIL'). `ESC x r m' Run the `emacs -f rmail' command. This will start the Emacs's ! `rmail' function so that you can read your mail (`READ-MAIL').  *************** *** 1503,1560 **** `/mnt' and the cursor points to the `fd1' subdirectory, the second floppy will be unmounted. - -  - File: git.info, Node: Sysinfo, Next: Environment, Prev: Mounting, Up: git - - Getting some useful system information - -------------------------------------- - - `^X T' - Call `date'(1) in order to display the current time/date - (`DATE'). - - `ESC S f' - Call `finger'(1) in order to display information about local and - remote users (`FINGER'). - - `ESC S m' - Call `mount'(1) in order to display a list of the currently - mounted file systems (`MOUNTED-FILE-SYSTEMS'). - - `ESC S q' - Call `quota'(1) in order to display a user file system disk quota - and quota (`QUOTA'). - - `ESC S s' - Call `df'(1) in order to get the status of the currently mounted - file systems (`DISK-FREE-SPACE'). - - `ESC S u' - Call `users'(1) in order to get the name of the currently logged in - users (`USERS'). - - `ESC S v' - Call `$GIT_VMSTAT'(1) in order to get the current virtual memory - status. This is very system dependent, `Linux' uses `free', - other systems use `vmstat', so the $GIT_VMSTAT variable is - used to deal with this (`VIRTUAL-MEMORY-STATUS'). - *Note Environment Variables::, for more information. - - `ESC S w' - Call `who'(1) in order to find out who is on the system - (`WHO'). - -  - File: git.info, Node: Environment, Next: Processes, Prev: Sysinfo, Up: git - - How to look at the environment variables - ---------------------------------------- - - `^X E' - Call `env'(1) in order to display the current environment - (`ENV'). - - `^X H' - Call `xhost'(1) in order to add/remove hosts names to the list - allowed to make connection to the X server (`XHOST'). --- 1553,1555 ---- diff -rc2P git-4.3.14/info/git.info-2 /home/tudor/src/git/git-4.3.15/info/git.info-2 *** git-4.3.14/info/git.info-2 Tue Dec 3 20:46:17 1996 --- /home/tudor/src/git/git-4.3.15/info/git.info-2 Sun Dec 22 20:35:18 1996 *************** *** 27,30 **** --- 27,85 ----  + File: git.info, Node: Sysinfo, Next: Environment, Prev: Mounting, Up: git + + Getting some useful system information + -------------------------------------- + + `^X T' + Call `date'(1) in order to display the current time/date + (`DATE'). + + `ESC S f' + Call `finger'(1) in order to display information about local and + remote users (`FINGER'). + + `ESC S m' + Call `mount'(1) in order to display a list of the currently + mounted file systems (`MOUNTED-FILE-SYSTEMS'). + + `ESC S q' + Call `quota'(1) in order to display a user file system disk quota + and quota (`QUOTA'). + + `ESC S s' + Call `df'(1) in order to get the status of the currently mounted + file systems (`DISK-FREE-SPACE'). + + `ESC S u' + Call `users'(1) in order to get the name of the currently logged in + users (`USERS'). + + `ESC S v' + Call `$GIT_VMSTAT'(1) in order to get the current virtual memory + status. This is very system dependent, `Linux' uses `free', + other systems use `vmstat', so the $GIT_VMSTAT variable is + used to deal with this (`VIRTUAL-MEMORY-STATUS'). + *Note Environment Variables::, for more information. + + `ESC S w' + Call `who'(1) in order to find out who is on the system + (`WHO'). + +  + File: git.info, Node: Environment, Next: Processes, Prev: Sysinfo, Up: git + + How to look at the environment variables + ---------------------------------------- + + `^X E' + Call `env'(1) in order to display the current environment + (`ENV'). + + `^X H' + Call `xhost'(1) in order to add/remove hosts names to the list + allowed to make connection to the X server (`XHOST'). + +  File: git.info, Node: Processes, Next: Sync, Prev: Environment, Up: git *************** *** 184,188 ****  ! File: git.info, Node: gitaction, Next: gitredir, Prev: gitmount, Up: Description The GIT per file type action script --- 239,243 ----  ! File: git.info, Node: gitaction, Next: gitrgrep, Prev: gitmount, Up: Description The GIT per file type action script *************** *** 232,260 ****  ! File: git.info, Node: gitredir, Next: gitrgrep, Prev: gitaction, Up: Description ! ! The GIT stdout to stderr redirection script ! =========================================== ! ! `gitredir' is a very small script that fools the `git' program, ! making it believe that the command started wrote something to standard ! error. It was not designed to be used as a stand alone program. ! ! `gitredir' is useful for programs like `du'. We are interested in ! du's output and we would like to write it on the status line ! (especially the output of the 'du -s' command). Normally, this is not ! possible because 'du -s' will display the information on the standard ! output (`git' catches only standard error) and will exit with the exit ! code 0. `git' will display the standard error contents on the status ! bar only if the program exit status is not 0. ! ! So, `gitredir' starts a program, sends its standard output through a ! pipe to a sub-shell which read from the pipe and write to standard ! error. After that, `gitredir' exits with the exit code 1. This way, ! `git' thinks that an error occured and display the standard error ! redirection file to the status bar. Stupid, but useful. ! !  ! File: git.info, Node: gitrgrep, Prev: gitredir, Up: Description The GIT recursive grep script --- 287,291 ----  ! File: git.info, Node: gitrgrep, Prev: gitaction, Up: Description The GIT recursive grep script *************** *** 293,299 **** The configuration files use shell environment variables to call the shell, editor, mail reader, compress and virtual memory status utility. ! That means that if you set GIT_SHELL, GIT_EDITOR, GIT_RMAIL, ! GIT_COMPRESS or GIT_VMSTAT to some value, that value will be used ! instead of the default one. The defaults are: GIT_SHELL='/bin/sh' --- 324,330 ---- The configuration files use shell environment variables to call the shell, editor, mail reader, compress and virtual memory status utility. ! That means that if you set GIT_SHELL, GIT_EDITOR, GIT_RMAIL, or ! GIT_VMSTAT to some value, that value will be used instead of the ! default one. The defaults are: GIT_SHELL='/bin/sh' *************** *** 301,305 **** GIT_RMAIL='emacs -f rmail' GIT_PAGER='more' - GIT_COMPRESS='gzip -9' GIT_VMSTAT='free' --- 332,335 ---- *************** *** 313,317 **** export GIT_RMAIL='elm' export GIT_PAGER='less' - export GIT_COMPRESS='compress' export GIT_VMSTAT='vmstat' --- 343,346 ---- *************** *** 978,982 **** to. You must write a small script instead: ! #!/bin/sh more /etc/passwd more /etc/group --- 1007,1011 ---- to. You must write a small script instead: ! #! /bin/sh more /etc/passwd more /etc/group *************** *** 1012,1015 **** --- 1041,1045 ---- * ^C 2 a: Mail. * ^C 2 b: Mail. + * ^C 2 m: Mail. * ^C =: Comparing Files. * ^C a: Archive Files. *************** *** 1017,1024 **** * ^C b 2 a: Mail. * ^C b 2 b: Mail. * ^C b a: Archive Files. * ^C b C: Copying Files. * ^C b C (for directories): Copying Dirs. ! * ^C b d: Comparing Files. * ^C b D: Deleting Files. * ^C b D (for directories): Deleting Dirs. --- 1047,1055 ---- * ^C b 2 a: Mail. * ^C b 2 b: Mail. + * ^C b 2 m: Mail. * ^C b a: Archive Files. * ^C b C: Copying Files. * ^C b C (for directories): Copying Dirs. ! * ^C b d: Comparing Dirs. * ^C b D: Deleting Files. * ^C b D (for directories): Deleting Dirs. *************** *** 1028,1031 **** --- 1059,1063 ---- * ^C b H: Linking Files. * ^C b I: RPM Packages. + * ^C b k: Encoding Files. * ^C b M: Inode. * ^C b m D: MSDOS Files. *************** *** 1049,1062 **** * ^C b z: Compressing Files. * ^C C (for directories): Copying Dirs. ! * ^C c q: Comparing Directories. ! * ^C c t: Comparing Directories. ! * ^C d: Comparing Files. * ^C D (for directories): Deleting Dirs. * ^C e: Encoding Files. * ^C ESC =: Comparing Files. * ^C f Z: Compressing Files. * ^C G: Inode. * ^C H: Linking Files. * ^C I: RPM Packages. * ^C M: Inode. * ^C m D: MSDOS Files. --- 1081,1096 ---- * ^C b z: Compressing Files. * ^C C (for directories): Copying Dirs. ! * ^C c q: Comparing Dirs. ! * ^C c t: Comparing Dirs. ! * ^C d: Comparing Dirs. * ^C D (for directories): Deleting Dirs. * ^C e: Encoding Files. * ^C ESC =: Comparing Files. + * ^C f d: Comparing Dirs. * ^C f Z: Compressing Files. * ^C G: Inode. * ^C H: Linking Files. * ^C I: RPM Packages. + * ^C k: Encoding Files. * ^C M: Inode. * ^C m D: MSDOS Files. *************** *** 1089,1092 **** --- 1123,1127 ---- * ^C x: Archive Files. * ^C z: Compressing Files. + * ^C ~: Packing Files. * ^E: Moving Point. * ^F, RIGHT: Moving Point. diff -rc2P git-4.3.14/info/git.info-3 /home/tudor/src/git/git-4.3.15/info/git.info-3 *** git-4.3.14/info/git.info-3 Tue Dec 3 20:46:17 1996 --- /home/tudor/src/git/git-4.3.15/info/git.info-3 Sun Dec 22 20:35:18 1996 *************** *** 47,53 **** * B-DELETE: Deleting Files. * B-DELETE (for directories): Deleting Dirs. ! * B-DIRR-DIFF: Comparing Files. * B-LINK: Linking Files. * B-MAKE: Compiling. * B-MOVE: Moving Files. * B-MOVE (for directories): Moving Dirs. --- 47,56 ---- * B-DELETE: Deleting Files. * B-DELETE (for directories): Deleting Dirs. ! * B-DIRR-DIFF: Comparing Dirs. * B-LINK: Linking Files. * B-MAKE: Compiling. + * B-MIME-MAIL: Mail. + * B-MIME-PACK: Encoding Files. + * B-MIME-UNPACK: Encoding Files. * B-MOVE: Moving Files. * B-MOVE (for directories): Moving Dirs. *************** *** 82,85 **** --- 85,89 ---- * beginning-of-panel: Moving. * BF-UNCOMPRESS: Compressing Files. + * bin-packing: Packing Files. * BINARY-MAIL: Mail. * capitalize-word: Case Changes. *************** *** 101,105 **** * DIFF: Comparing Files. * DIRECTORY-USAGE: Dirs Usage. ! * DIRR-DIFF: Comparing Files. * DISK-FREE-SPACE: Sysinfo. * downcase-word: Case Changes. --- 105,109 ---- * DIFF: Comparing Files. * DIRECTORY-USAGE: Dirs Usage. ! * DIRR-DIFF: Comparing Dirs. * DISK-FREE-SPACE: Sysinfo. * downcase-word: Case Changes. *************** *** 115,118 **** --- 119,123 ---- * exit: Exit. * F-UNCOMPRESS: Compressing Files. + * FAST-DIFF: Comparing Dirs. * FILE-ACTION: Actions. * FILE-CREATE: Editing Files. *************** *** 146,149 **** --- 151,155 ---- * make-directory: Creating Dirs. * MAN: Documentation. + * MIME-MAIL: Mail. * MOUNT-A: Mounting. * MOUNT-B: Mounting. *************** *** 152,155 **** --- 158,162 ---- * move: Moving Files. * move (for directories): Moving Dirs. + * MPACK: Encoding Files. * MTOOLS-CHDIR: MSDOS Files. * MTOOLS-DELETE: MSDOS Files. *************** *** 164,167 **** --- 171,175 ---- * MULTIPLE-EDIT: Editing Files. * MULTIPLE-VIEW: Viewing Files. + * MUNPACK: Encoding Files. * name-downcase: Renaming Files. * name-upcase: Renaming Files. *************** *** 192,196 **** * previous-line: Moving. * PSTREE: Processes. ! * quick-compare-panels: Comparing Directories. * QUOTA: Sysinfo. * R-CHGRP: Inode. --- 200,204 ---- * previous-line: Moving. * PSTREE: Processes. ! * quick-compare-panels: Comparing Dirs. * QUOTA: Sysinfo. * R-CHGRP: Inode. *************** *** 222,226 **** * TAR: Archive Files. * TAR-COMPRESS: Archive Files. ! * thoroughly-compare-panels: Comparing Directories. * tty-mode: Modes. * TTY-RESET: Reseting. --- 230,234 ---- * TAR: Archive Files. * TAR-COMPRESS: Archive Files. ! * thoroughly-compare-panels: Comparing Dirs. * tty-mode: Modes. * TTY-RESET: Reseting. *************** *** 259,263 **** * ConfirmOnExit: GIT-Setup. * EDITOR: Environment Variables. - * GIT_COMPRESS: Environment Variables. * GIT_EDITOR: Environment Variables. * GIT_RMAIL: Environment Variables. --- 267,270 ---- *************** *** 290,294 **** * Background directory copy: Copying Dirs. * Background directory delete: Deleting Dirs. ! * Background directory diff: Comparing Files. * Background directory move: Moving Dirs. * Background directory rename: Renaming Dirs. --- 297,301 ---- * Background directory copy: Copying Dirs. * Background directory delete: Deleting Dirs. ! * Background directory diff: Comparing Dirs. * Background directory move: Moving Dirs. * Background directory rename: Renaming Dirs. *************** *** 333,340 **** * chmod: Inode. * chown: Inode. ! * Comparing directories quickly: Comparing Directories. ! * Comparing directories thoroughly: Comparing Directories. ! * Comparing panels quickly: Comparing Directories. ! * Comparing panels thoroughly: Comparing Directories. * Compile: Compiling. * Compiling programs: Compiling. --- 340,347 ---- * chmod: Inode. * chown: Inode. ! * Comparing directories quickly: Comparing Dirs. ! * Comparing directories thoroughly: Comparing Dirs. ! * Comparing panels quickly: Comparing Dirs. ! * Comparing panels thoroughly: Comparing Dirs. * Compile: Compiling. * Compiling programs: Compiling. *************** *** 400,408 **** * diff: Comparing Files. * Differences between ascii files: Comparing Files. * Differences between file and backup: Comparing Files. ! * Differences between two directories: Comparing Files. * Directory copy: Copying Dirs. * Directory delete: Deleting Dirs. ! * Directory diff: Comparing Files. * Directory history reset: Dirs History. * Directory mode: Modes. --- 407,416 ---- * diff: Comparing Files. * Differences between ascii files: Comparing Files. + * Differences between directories: Comparing Dirs. * Differences between file and backup: Comparing Files. ! * Differences between two directories: Comparing Dirs. * Directory copy: Copying Dirs. * Directory delete: Deleting Dirs. ! * Directory diff: Comparing Dirs. * Directory history reset: Dirs History. * Directory mode: Modes. *************** *** 467,471 **** * gitmount: gitmount. * gitps: gitps. - * gitredir: gitredir. * gitregrep: gitrgrep. * gitrfgrep: gitrgrep. --- 475,478 ---- *************** *** 521,524 **** --- 528,532 ---- * Making a directory: Creating Dirs. * Mark entry: Selecting. + * Mime encoded files by mail: Mail. * Minor modes: Modes. * mount: Mounting. *************** *** 536,540 **** --- 544,550 ---- * Moving files: Moving Files. * Moving files in background: Moving Files. + * mpack: Encoding Files. * Multiple edit: Editing Files. + * munpack: Encoding Files. * Next directory history entry: Dirs History. * Next history element: History. *************** *** 545,548 **** --- 555,559 ---- * Owner and group: Modes. * Owner, group: Modes. + * Pack files into bins: Packing Files. * Previous directory history entry: Dirs History. * Previous history element: History. *************** *** 581,584 **** --- 592,597 ---- * Sending files by mail: Mail. * Sending mail: Mail. + * Sending mime mail: Mail. + * Sending mime mail in background: Mail. * Sending text by mail: Mail. * Set mark: Setting Mark. diff -rc2P git-4.3.14/info/git.texinfo /home/tudor/src/git/git-4.3.15/info/git.texinfo *** git-4.3.14/info/git.texinfo Tue Dec 3 20:46:05 1996 --- /home/tudor/src/git/git-4.3.15/info/git.texinfo Sun Dec 22 19:36:17 1996 *************** *** 8,12 **** @set EDITION 2.5 ! @set VERSION 4.3.14 @set UPDATED December 1996 --- 8,12 ---- @set EDITION 2.5 ! @set VERSION 4.3.15 @set UPDATED December 1996 *************** *** 178,182 **** * gitmount:: A script for mounting file systems. * gitaction:: A per file type action script. - * gitredir:: A internal stdout to stderr redirection script. * gitrgrep:: A recursive grep script. @end menu --- 178,181 ---- *************** *** 694,700 **** @kbd{^C s} @display ! Select (marks) all the files matching a pattern ! (@samp{select-files-matching-pattern}). The user will be prompted for a ! pattern to match against. @end display @cindex Selects files matching pattern --- 693,700 ---- @kbd{^C s} @display ! Select (marks) all the files matching at least one pattern from a ! space separated list of shell patterns. Spaces and \s are allowed in ! the patterns but they have to be escaped with a \. ! (@samp{select-files-matching-pattern}). @end display @cindex Selects files matching pattern *************** *** 1115,1127 **** * Linking Files:: How to create hard and symbolic links. * Renaming Files:: How to rename files. ! * Inode:: How to change a file inode mode, owner, group. * Editing Files:: How to edit and create files. Default editor. * Viewing Files:: How to view files. Default viewer. * Compressing Files:: How to compress and decompress files. ! * Encoding Files:: How to uuencode/uudecode a file. * Encrypting Files:: How to encrypt/decrypt files with pgp. * Comparing Files:: How to compare two files. - * Comparing Directories:: How to compare the files in two directories. * Spelling Files:: How to spell a file. * Wiping Files:: How to wipe a file. --- 1115,1127 ---- * Linking Files:: How to create hard and symbolic links. * Renaming Files:: How to rename files. ! * Packing Files:: How to pack files in the min. number of bins. ! * Inode:: How to change a file's mode, owner, group. * Editing Files:: How to edit and create files. Default editor. * Viewing Files:: How to view files. Default viewer. * Compressing Files:: How to compress and decompress files. ! * Encoding Files:: How to uuencode/uudecode, mpack/munpack a file. * Encrypting Files:: How to encrypt/decrypt files with pgp. * Comparing Files:: How to compare two files. * Spelling Files:: How to spell a file. * Wiping Files:: How to wipe a file. *************** *** 1263,1267 **** ! @node Renaming Files, Inode, Linking Files, Files @subsubsection Renaming Files --- 1263,1267 ---- ! @node Renaming Files, Packing Files, Linking Files, Files @subsubsection Renaming Files *************** *** 1309,1314 **** ! @node Inode, Editing Files, Renaming Files, Files ! @subsubsection Changing a file's inode mode, owner and group @noindent --- 1309,1338 ---- ! @node Packing Files, Inode, Renaming Files, Files ! @subsubsection Packing files into the minimum number of bins ! ! @noindent ! @kbd{^C ~} ! @display ! Pack the files into the smallest number of bins. This is in fact an ! approximation, since the problem is NP-complete and no known algorithm ! can guarantee a solution better than @samp{(11/9) * OPTIMAL + 4}. ! ! To make things even worst, it is generally difficult to figure out the ! file system block size for the target bin. Asking the user is not a ! good idea either. @samp{git} currently assumes a file system block size ! of 1Kb. ! ! Bin packing can be useful when you want to put a bunch of files on ! floppies and you want to optimize things a little bit ! (@samp{bin-packing}). ! @end display ! @cindex Pack files into bins ! @findex bin-packing ! @kindex ^C ~ ! ! ! @node Inode, Editing Files, Packing Files, Files ! @subsubsection Changing a file's mode, owner and group @noindent *************** *** 1637,1640 **** --- 1661,1704 ---- @kindex ^C b E + @noindent + @kbd{^C k} + @display + Encode the currently selected file using mpack (@samp{MIME-PACK}). + @end display + @cindex Encoding files + @cindex mpack + @findex MPACK + @kindex ^C k + + @noindent + @kbd{^C b k} + @display + Encode the currently selected file using mpack. The operation is + performed in background (@samp{B-MIME-PACK}). + @end display + @cindex Encoding files in background + @findex B-MIME-PACK + @kindex ^C b k + + @noindent + @kbd{^C K} + @display + Decode the currently selected file using munpack (@samp{MIME-UNPACK}). + @end display + @cindex munpack + @cindex Decoding files + @findex MUNPACK + @kindex ^C K + + @noindent + @kbd{^C b K} + @display + Decode the currently selected file using munpack. The operation is + performed in background (@samp{B-MIME-UNPACK}). + @end display + @cindex Decoding files in background + @findex B-MIME-UNPACK + @kindex ^C b K + @node Encrypting Files, Comparing Files, Encoding Files, Files *************** *** 1660,1664 **** ! @node Comparing Files, Comparing Directories, Encrypting Files, Files @subsubsection Comparing Files --- 1724,1728 ---- ! @node Comparing Files, Spelling Files, Encrypting Files, Files @subsubsection Comparing Files *************** *** 1666,1671 **** @kbd{^C =} @display ! Compare (using @code{diff}) the current ASCII file with the other panel ! current file (@samp{DIFF}). If both entries are directories, a recursive diff is performed. @end display --- 1730,1735 ---- @kbd{^C =} @display ! Compare (using @code{diff}) the current ASCII file with the other ! panel's current file (@samp{DIFF}). If both entries are directories, a recursive diff is performed. @end display *************** *** 1688,1715 **** @noindent - @kbd{^C d} - @display - Compare (using @code{diff}) the current directory with the other panel - current directory. For successful operation, both panels should contain - the same directory (@samp{DIR-DIFF}). - @end display - @cindex Directory diff - @cindex Differences between two directories - @findex DIRR-DIFF - @kindex ^C d - - @noindent - @kbd{^C b d} - @display - Compare (using @code{diff}) the current directory with the other panel - current directory. For successful operation, both panels should contain - the same directory. The operation is performed in background - (@samp{DIR-DIFF}). - @end display - @cindex Background directory diff - @findex B-DIRR-DIFF - @kindex ^C b d - - @noindent @kbd{^C B} @display --- 1752,1755 ---- *************** *** 1722,1755 **** ! @node Comparing Directories, Spelling Files, Comparing Files, Files ! @subsubsection Comparing Directories ! ! @noindent ! @kbd{^C c q} ! @display ! Quickly compare the files in the left panel with the files in the right ! one. Only the file names, sizes and time stamps are considered in the ! comparison. ! @end display ! @cindex Comparing directories quickly ! @cindex Comparing panels quickly ! @findex quick-compare-panels ! @kindex ^C c q ! ! @noindent ! @kbd{^C c t} ! @display ! Compare the files in the left panel with the files in the right one. ! The contents of each file in the current panel will be compared against ! the contents of its couterpart (if any) from the other panel. ! @end display ! @cindex Comparing directories thoroughly ! @cindex Comparing panels thoroughly ! @findex thoroughly-compare-panels ! @kindex ^C c t ! ! ! ! @node Spelling Files, Wiping Files, Comparing Directories, Files @subsubsection Spelling Files --- 1762,1766 ---- ! @node Spelling Files, Wiping Files, Comparing Files, Files @subsubsection Spelling Files *************** *** 2186,2189 **** --- 2197,2201 ---- * Moving Dirs:: How to move directories. * Renaming Dirs:: How to rename directories. + * Comparing Dirs:: How to compare directories. * Dirs Usage:: Summarize directory usage. * Changing Dirs:: How to go to a new directory. *************** *** 2297,2301 **** ! @node Renaming Dirs, Dirs Usage, Moving Dirs, Directories @subsubsection Renaming directories --- 2309,2313 ---- ! @node Renaming Dirs, Comparing Dirs, Moving Dirs, Directories @subsubsection Renaming directories *************** *** 2323,2327 **** ! @node Dirs Usage, Changing Dirs, Renaming Dirs, Directories @subsubsection Summarize directory usage --- 2335,2404 ---- ! ! @node Comparing Dirs, Dirs Usage, Renaming Dirs, Directories ! @subsubsection Comparing Directories ! ! @noindent ! @kbd{^C c q} ! @display ! Quickly compare the files in the left panel with the files in the right ! one. Only the file names, sizes and time stamps are considered in the ! comparison. ! @end display ! @cindex Comparing directories quickly ! @cindex Comparing panels quickly ! @findex quick-compare-panels ! @kindex ^C c q ! ! @noindent ! @kbd{^C c t} ! @display ! Compare the files in the left panel with the files in the right one. ! The contents of each file in the current panel will be compared against ! the contents of its couterpart (if any) from the other panel. ! @end display ! @cindex Comparing directories thoroughly ! @cindex Comparing panels thoroughly ! @findex thoroughly-compare-panels ! @kindex ^C c t ! ! @noindent ! @kbd{^C f d} ! @display ! Recursively compare (using @code{diff -r -q}) the current directory with ! the other panel's current directory (@samp{FAST-DIFF}). Print on ! standard output the names of the files that differ. ! @end display ! @cindex Directory diff ! @cindex Differences between directories ! @findex FAST-DIFF ! @kindex ^C f d ! ! @noindent ! @kbd{^C d} ! @display ! Compare (using @code{diff}) the current directory with the other panel ! current directory. For successful operation, both panels should contain ! the same directory (@samp{DIR-DIFF}). ! @end display ! @cindex Directory diff ! @cindex Differences between two directories ! @findex DIRR-DIFF ! @kindex ^C d ! ! @noindent ! @kbd{^C b d} ! @display ! Compare (using @code{diff}) the current directory with the other panel ! current directory. For successful operation, both panels should contain ! the same directory. The operation is performed in background ! (@samp{DIR-DIFF}). ! @end display ! @cindex Background directory diff ! @findex B-DIRR-DIFF ! @kindex ^C b d ! ! ! @node Dirs Usage, Changing Dirs, Comparing Dirs, Directories @subsubsection Summarize directory usage *************** *** 2498,2502 **** @display Run the @code{make} command in the current directory. Use -k as the ! default option. @end display @cindex Compiling programs --- 2575,2579 ---- @display Run the @code{make} command in the current directory. Use -k as the ! default option (@samp{MAKE}). @end display @cindex Compiling programs *************** *** 2509,2513 **** @kbd{^X b m} @display ! Run the @code{make} command in background in the current directory. @end display @xref{gitaction}, for more information. --- 2586,2591 ---- @kbd{^X b m} @display ! Run the @code{make} command in background in the current directory ! (@samp{B-MAKE}). @end display @xref{gitaction}, for more information. *************** *** 2524,2528 **** @display Send the current current ascii file by mail to an user supplied email ! address. @end display @cindex Sending ascii mail --- 2602,2606 ---- @display Send the current current ascii file by mail to an user supplied email ! address (@samp{ASCII-MAIL}). @end display @cindex Sending ascii mail *************** *** 2534,2539 **** @kbd{^C b 2 a} @display ! The same as above, the only difference being that the command runs in ! background. @end display @cindex Sending ascii mail in background --- 2612,2617 ---- @kbd{^C b 2 a} @display ! The same as @samp{ASCII-MAIL}, the only difference being that the ! command runs in background (@samp{B-ASCII-MAIL}). @end display @cindex Sending ascii mail in background *************** *** 2546,2551 **** @kbd{^C 2 b} @display ! Send the current current binary file by mail to an user supplied email ! address. The file is uuencoded first. @end display @cindex Sending binary mail --- 2624,2629 ---- @kbd{^C 2 b} @display ! Send the current current binary file by mail to an user supplied list of ! email addresses. The file is uuencoded first (@samp{BINARY-MAIL}). @end display @cindex Sending binary mail *************** *** 2557,2562 **** @kbd{^C b 2 b} @display ! The same as above, the only difference being that the command runs in ! background. @end display @cindex Sending binary mail in background --- 2635,2640 ---- @kbd{^C b 2 b} @display ! The same as @samp{BINARY-MAIL}, the only difference being that the ! command runs in background (@samp{B-BINARY-MAIL}). @end display @cindex Sending binary mail in background *************** *** 2565,2572 **** @noindent @kbd{ESC x r m} @display Run the @code{emacs -f rmail} command. This will start the Emacs's ! @samp{rmail} function so that you can read your mail. @end display @cindex Emacs rmail --- 2643,2672 ---- @noindent + @kbd{^C 2 m} + @display + Send the current current binary file by mail to an user supplied list of + email addresses. The file is encoded with mpack first + (@samp{MIME-MAIL}). + @end display + @cindex Sending mime mail + @cindex Mime encoded files by mail + @findex MIME-MAIL + @kindex ^C 2 m + + @noindent + @kbd{^C b 2 m} + @display + The same as @samp{MIME-MAIL}, the only difference being that the command + runs in background (@samp{B-MIME-MAIL}). + @end display + @cindex Sending mime mail in background + @findex B-MIME-MAIL + @kindex ^C b 2 m + + @noindent @kbd{ESC x r m} @display Run the @code{emacs -f rmail} command. This will start the Emacs's ! @samp{rmail} function so that you can read your mail (@samp{READ-MAIL}). @end display @cindex Emacs rmail *************** *** 3123,3127 **** ! @node gitaction, gitredir, gitmount, Description @section The GIT per file type action script @cindex gitaction --- 3223,3227 ---- ! @node gitaction, gitrgrep, gitmount, Description @section The GIT per file type action script @cindex gitaction *************** *** 3176,3204 **** directory. - @node gitredir, gitrgrep, gitaction, Description - @section The GIT stdout to stderr redirection script - @cindex gitredir - - @code{gitredir} is a very small script that fools the @code{git} - program, making it believe that the command started wrote something to - standard error. It was not designed to be used as a stand alone - program. - - @code{gitredir} is useful for programs like @code{du}. We are - interested in du's output and we would like to write it on the status - line (especially the output of the 'du -s' command). Normally, this is - not possible because 'du -s' will display the information on the - standard output (@code{git} catches only standard error) and will exit - with the exit code 0. @code{git} will display the standard error - contents on the status bar only if the program exit status is not 0. - - So, @code{gitredir} starts a program, sends its standard output through - a pipe to a sub-shell which read from the pipe and write to standard - error. After that, @code{gitredir} exits with the exit code 1. This - way, @code{git} thinks that an error occured and display the standard - error redirection file to the status bar. Stupid, but useful. - ! @node gitrgrep, , gitredir, Description @section The GIT recursive grep script @cindex gitrgrep --- 3276,3281 ---- directory. ! @node gitrgrep, , gitaction, Description @section The GIT recursive grep script @cindex gitrgrep *************** *** 3237,3242 **** shell, editor, mail reader, compress and virtual memory status utility. That means that if you set @var{GIT_SHELL}, @var{GIT_EDITOR}, ! @var{GIT_RMAIL}, @var{GIT_COMPRESS} or @var{GIT_VMSTAT} to some value, ! that value will be used instead of the default one. The defaults are: @display --- 3314,3319 ---- shell, editor, mail reader, compress and virtual memory status utility. That means that if you set @var{GIT_SHELL}, @var{GIT_EDITOR}, ! @var{GIT_RMAIL}, or @var{GIT_VMSTAT} to some value, that value will be ! used instead of the default one. The defaults are: @display *************** *** 3245,3249 **** GIT_RMAIL='emacs -f rmail' GIT_PAGER='more' - GIT_COMPRESS='gzip -9' GIT_VMSTAT='free' @end display --- 3322,3325 ---- *************** *** 3259,3263 **** export GIT_RMAIL='elm' export GIT_PAGER='less' - export GIT_COMPRESS='compress' export GIT_VMSTAT='vmstat' @end display --- 3335,3338 ---- *************** *** 3265,3269 **** @vindex GIT_EDITOR @vindex GIT_RMAIL - @vindex GIT_COMPRESS @vindex GIT_VMSTAT @vindex SHELL --- 3340,3343 ---- *************** *** 3903,3907 **** to. You must write a small script instead: ! #!/bin/sh more /etc/passwd --- 3977,3981 ---- to. You must write a small script instead: ! #! /bin/sh more /etc/passwd diff -rc2P git-4.3.14/man/Makefile.in /home/tudor/src/git/git-4.3.15/man/Makefile.in *** git-4.3.14/man/Makefile.in Tue Dec 3 15:11:10 1996 --- /home/tudor/src/git/git-4.3.15/man/Makefile.in Fri Dec 20 15:51:44 1996 *************** *** 39,43 **** ! GIT_MANUALS = git.1 gitaction.1 gitmount.1 gitkeys.1 gitredir.1 gitrgrep.1 --- 39,43 ---- ! GIT_MANUALS = git.1 gitaction.1 gitmount.1 gitkeys.1 gitrgrep.1 diff -rc2P git-4.3.14/man/git.1 /home/tudor/src/git/git-4.3.15/man/git.1 *** git-4.3.14/man/git.1 Tue Dec 3 15:11:23 1996 --- /home/tudor/src/git/git-4.3.15/man/git.1 Sun Dec 22 12:58:31 1996 *************** *** 118,122 **** the shell, editor, mail reader, compress and virtual memory status utility. That means that if you set ! .BR GIT_SHELL ", " GIT_EDITOR ", " GIT_RMAIL ", " GIT_COMPRESS " or " .B GIT_VMSTAT to some value, that value will be used instead of the default one. --- 118,122 ---- the shell, editor, mail reader, compress and virtual memory status utility. That means that if you set ! .BR GIT_SHELL ", " GIT_EDITOR ", " GIT_RMAIL " or " .B GIT_VMSTAT to some value, that value will be used instead of the default one. *************** *** 129,134 **** .B GIT_RMAIL='emacs -f rmail' .br - .B GIT_COMPRESS='gzip -9' - .br .B GIT_VMSTAT='free' --- 129,132 ---- *************** *** 154,159 **** .B export GIT_RMAIL='elm' .br - .B export GIT_COMPRESS='compress' - .br .B export GIT_VMSTAT='vmstat' --- 152,155 ---- *************** *** 1181,1185 **** You must write a small script instead: ! #!/bin/sh .br more /etc/passwd; more /etc/group --- 1177,1181 ---- You must write a small script instead: ! #! /bin/sh .br more /etc/passwd; more /etc/group *************** *** 1205,1209 **** .SH SEE ALSO termcap(5) terminfo(5) sh(1) ps(1) mount(8) umount(8) gitaction(1) gitmount(1) ! gitkeys(1) gitredir(1) gitrgrep(1) .SH FILES --- 1201,1205 ---- .SH SEE ALSO termcap(5) terminfo(5) sh(1) ps(1) mount(8) umount(8) gitaction(1) gitmount(1) ! gitkeys(1) gitrgrep(1) .SH FILES diff -rc2P git-4.3.14/man/gitaction.1 /home/tudor/src/git/git-4.3.15/man/gitaction.1 *** git-4.3.14/man/gitaction.1 Tue Dec 3 15:12:09 1996 --- /home/tudor/src/git/git-4.3.15/man/gitaction.1 Fri Dec 20 20:59:18 1996 *************** *** 151,155 **** .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitmount(1) gitkeys(1) gitredir(1) gitrgrep(1) .SH FILES --- 151,155 ---- .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitmount(1) gitkeys(1) gitrgrep(1) .SH FILES diff -rc2P git-4.3.14/man/gitkeys.1 /home/tudor/src/git/git-4.3.15/man/gitkeys.1 *** git-4.3.14/man/gitkeys.1 Tue Dec 3 15:12:05 1996 --- /home/tudor/src/git/git-4.3.15/man/gitkeys.1 Fri Dec 20 20:59:22 1996 *************** *** 46,50 **** .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitmount(1) gitaction(1) gitredir(1) gitrgrep(1) .SH FILES --- 46,50 ---- .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitmount(1) gitaction(1) gitrgrep(1) .SH FILES diff -rc2P git-4.3.14/man/gitmount.1 /home/tudor/src/git/git-4.3.15/man/gitmount.1 *** git-4.3.14/man/gitmount.1 Tue Dec 3 15:12:01 1996 --- /home/tudor/src/git/git-4.3.15/man/gitmount.1 Fri Dec 20 20:59:25 1996 *************** *** 63,67 **** .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitkeys(1) gitaction(1) gitredir(1) gitrgrep(1) .SH FILES --- 63,67 ---- .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitkeys(1) gitaction(1) gitrgrep(1) .SH FILES Only in git-4.3.14/man: gitredir.1 diff -rc2P git-4.3.14/man/gitrgrep.1 /home/tudor/src/git/git-4.3.15/man/gitrgrep.1 *** git-4.3.14/man/gitrgrep.1 Tue Dec 3 15:11:51 1996 --- /home/tudor/src/git/git-4.3.15/man/gitrgrep.1 Fri Dec 20 20:59:29 1996 *************** *** 56,60 **** .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitkeys(1) gitaction(1) gitmount(1) gitredir(1) .SH FILES --- 56,60 ---- .SH SEE ALSO ! git(1) gitps(1) gitview(1) gitkeys(1) gitaction(1) gitmount(1) .SH FILES diff -rc2P git-4.3.14/mkvcs /home/tudor/src/git/git-4.3.15/mkvcs *** git-4.3.14/mkvcs Mon Oct 30 04:35:48 1995 --- /home/tudor/src/git/git-4.3.15/mkvcs Sat Dec 21 18:53:23 1996 *************** *** 1,3 **** ! #!/bin/sh # Check for Linux --- 1,3 ---- ! #! /bin/sh # Check for Linux Binary files git-4.3.14/pictures/git-label.gif and /home/tudor/src/git/git-4.3.15/pictures/git-label.gif differ Binary files git-4.3.14/pictures/git-linux.gif and /home/tudor/src/git/git-4.3.15/pictures/git-linux.gif differ Binary files git-4.3.14/pictures/git-xterm.gif and /home/tudor/src/git/git-4.3.15/pictures/git-xterm.gif differ diff -rc2P git-4.3.14/src/.gdbinit /home/tudor/src/git/git-4.3.15/src/.gdbinit *** git-4.3.14/src/.gdbinit Thu Aug 8 07:33:04 1996 --- /home/tudor/src/git/git-4.3.15/src/.gdbinit Fri Dec 20 21:33:51 1996 *************** *** 1 **** --- 1,2 ---- + set env TERMCAP=/etc/termcap set env EF_PROTECT_FREE=1 diff -rc2P git-4.3.14/src/.gitaction /home/tudor/src/git/git-4.3.15/src/.gitaction *** git-4.3.14/src/.gitaction Wed Nov 20 14:30:32 1996 --- /home/tudor/src/git/git-4.3.15/src/.gitaction Mon Dec 23 16:41:49 1996 *************** *** 1,3 **** ! #!/bin/sh ############################################################################### --- 1,3 ---- ! #! /bin/sh ############################################################################### diff -rc2P git-4.3.14/src/ChangeLog /home/tudor/src/git/git-4.3.15/src/ChangeLog *** git-4.3.14/src/ChangeLog Mon Dec 2 19:36:58 1996 --- /home/tudor/src/git/git-4.3.15/src/ChangeLog Sun Dec 22 19:33:02 1996 *************** *** 1,2 **** --- 1,21 ---- + Sun Dec 22 19:32:57 1996 Tudor Hulubei + + * panel.c (panel_parse_patterns): New function. + + Fri Dec 20 15:23:35 1996 Tudor Hulubei + + * panel.c (panel_act_BIN_PACKING): New function. Implements the + First Fit Decreasing algorithm for bin packing the files in the + current directory. + (panel_update_size): git reports for the superuser the total + number of free blocks in the file system, not just the number of + free blocks available to the non-superuser. + + * git.c (il_read_char): IL_HOME - new flag. Position the cursor + at the beginning of the line. + + * panel.c (panel_copy): Fixed the start string to quote the + file/directory names. + Mon Dec 2 19:34:08 1996 Tudor Hulubei diff -rc2P git-4.3.14/src/Makefile.in /home/tudor/src/git/git-4.3.15/src/Makefile.in *** git-4.3.14/src/Makefile.in Wed Dec 4 21:17:10 1996 --- /home/tudor/src/git/git-4.3.15/src/Makefile.in Mon Dec 23 21:00:54 1996 *************** *** 60,64 **** xmalloc.o xstring.o xio.o GIT_BINS = git gitps gitview gitkeys gitwipe ! GIT_SCRIPTS = gitmount gitaction gitredir gitrgrep gitxgrep .gitaction GIT_RGREPS = gitregrep gitrfgrep --- 60,64 ---- xmalloc.o xstring.o xio.o GIT_BINS = git gitps gitview gitkeys gitwipe ! GIT_SCRIPTS = gitmount gitaction gitrgrep gitxgrep .gitaction GIT_RGREPS = gitregrep gitrfgrep diff -rc2P git-4.3.14/src/TAGS /home/tudor/src/git/git-4.3.15/src/TAGS *** git-4.3.14/src/TAGS Wed Dec 4 21:17:12 1996 --- /home/tudor/src/git/git-4.3.15/src/TAGS Mon Dec 23 21:00:54 1996 *************** *** 13,150 **** fsusage.c,435 fs_adjust_blocks 64,1592 ! get_fs_usage 86,2225 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS95,2421 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS103,2642 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS116,3083 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS124,3278 ! # define CONVERT_BLOCKS(CONVERT_BLOCKS136,3682 ! # define CONVERT_BLOCKS(CONVERT_BLOCKS138,3763 ! # define f_bavail 141,3931 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS153,4162 ! statfs 172,4713 ! git.c,4707 #define HAVE_PUTENV 75,1693 #define MAX_STATIC_SIZE 87,1897 ! #define GIT_SCREEN_MODE 105,2277 ! #define GIT_TERMINAL_MODE 106,2311 ! #define BUILTIN_OPERATIONS 158,3427 ! #define BUILTIN_copy 160,3480 ! #define BUILTIN_move 161,3507 ! #define BUILTIN_make_directory 162,3534 ! #define BUILTIN_delete 163,3570 ! #define BUILTIN_exit 164,3599 ! #define BUILTIN_previous_history_element 165,3626 ! #define BUILTIN_tty_mode 166,3670 ! #define BUILTIN_refresh 167,3700 ! #define BUILTIN_switch_panels 168,3730 ! #define BUILTIN_next_history_element 169,3765 ! #define BUILTIN_panel_enable_next_mode 170,3807 ! #define BUILTIN_panel_enable_owner_group 171,3851 ! #define BUILTIN_panel_enable_date_time 172,3896 ! #define BUILTIN_panel_enable_size 173,3940 ! #define BUILTIN_panel_enable_mode 174,3979 ! #define BUILTIN_panel_enable_full_name 175,4018 ! #define BUILTIN_panel_sort_next_method 176,4062 ! #define BUILTIN_panel_sort_by_name 177,4106 ! #define BUILTIN_panel_sort_by_extension 178,4146 ! #define BUILTIN_panel_sort_by_size 179,4191 ! #define BUILTIN_panel_sort_by_date 180,4231 ! #define BUILTIN_panel_sort_by_mode 181,4271 ! #define BUILTIN_panel_sort_by_owner_id 182,4311 ! #define BUILTIN_panel_sort_by_group_id 183,4355 ! #define BUILTIN_panel_sort_by_owner_name 184,4399 ! #define BUILTIN_panel_sort_by_group_name 185,4444 ! #define BUILTIN_select_entry 186,4489 ! #define BUILTIN_entry_to_input_line 187,4524 ! #define BUILTIN_beginning_of_panel 188,4565 ! #define BUILTIN_end_of_panel 189,4605 ! #define BUILTIN_scroll_down 190,4640 ! #define BUILTIN_scroll_up 191,4674 ! #define BUILTIN_previous_line 192,4706 ! #define BUILTIN_next_line 193,4742 ! #define BUILTIN_other_panel 194,4774 ! #define BUILTIN_change_directory 195,4808 ! #define BUILTIN_hard_refresh 196,4846 ! #define BUILTIN_select_files_matching_pattern 197,4881 ! #define BUILTIN_unselect_files_matching_pattern 198,4931 ! #define BUILTIN_adapt_current_directory 199,4983 ! #define BUILTIN_adapt_other_directory 200,5028 ! #define BUILTIN_other_path_to_input_line 201,5071 ! #define BUILTIN_selected_entries_to_input_line 202,5116 ! #define BUILTIN_backward_char 203,5167 ! #define BUILTIN_forward_char 204,5203 ! #define BUILTIN_backward_word 205,5238 ! #define BUILTIN_forward_word 206,5274 ! #define BUILTIN_beginning_of_line 207,5309 ! #define BUILTIN_end_of_line 208,5348 ! #define BUILTIN_delete_char 209,5382 ! #define BUILTIN_backward_delete_char 210,5416 ! #define BUILTIN_kill_word 211,5458 ! #define BUILTIN_backward_kill_word 212,5490 ! #define BUILTIN_kill_line 213,5530 ! #define BUILTIN_kill_to_beginning_of_line 214,5562 ! #define BUILTIN_kill_to_end_of_line 215,5608 ! #define BUILTIN_just_one_space 216,5649 ! #define BUILTIN_delete_horizontal_space 217,5686 ! #define BUILTIN_downcase_word 218,5731 ! #define BUILTIN_upcase_word 219,5767 ! #define BUILTIN_capitalize_word 220,5801 ! #define BUILTIN_action 221,5839 ! #define BUILTIN_set_mark 222,5869 ! #define BUILTIN_kill_region 223,5900 ! #define BUILTIN_kill_ring_save 224,5934 ! #define BUILTIN_yank 225,5971 ! #define BUILTIN_exchange_point_and_mark 226,5999 ! #define BUILTIN_set_scroll_step 227,6044 ! #define BUILTIN_isearch_backward 228,6082 ! #define BUILTIN_isearch_forward 229,6120 ! #define BUILTIN_previous_directory 230,6158 ! #define BUILTIN_next_directory 231,6198 ! #define BUILTIN_reset_directory_history 232,6235 ! #define BUILTIN_enlarge_panel 233,6280 ! #define BUILTIN_enlarge_other_panel 234,6316 ! #define BUILTIN_two_panels 235,6357 ! #define BUILTIN_lock 236,6390 ! #define BUILTIN_quick_compare_panels 237,6418 ! #define BUILTIN_thorough_compare_panels 238,6460 ! #define BUILTIN_name_downcase 239,6505 ! #define BUILTIN_name_upcase 240,6541 ! #define BUILTIN_up_one_dir 241,6575 ! #define BUILTIN_compare 242,6608 ! #define MAX_BUILTIN_NAME 245,6641 ! } command_t;command_t350,9433 ! #define MAX_KEYS 353,9448 ! #define KEYSDATA_FIELDS 354,9503 ! #define TITLE_FIELDS 357,9534 ! #define TitleForeground 380,9937 ! #define TitleBackground 381,9976 ! #define TitleBrightness 382,10015 ! #define UserName 383,10054 ! #define TtyName 384,10093 ! #define IL_ISEARCH_BEGIN 392,10268 ! #define IL_ISEARCH_BACKWARD 393,10302 ! #define IL_ISEARCH_FORWARD 394,10336 ! #define IL_ISEARCH_END 395,10370 ! il_history_add_entry(411,10797 ! il_history_view_entry(432,11148 ! il_dispatch_commands(451,11642 ! il_fix_text(585,14018 ! il_build_help_from_string(618,14568 ! il_read_char(652,15373 ! il_read_line(760,17203 ! il_isearch(904,20400 ! dir_history_reset(1008,22446 ! dir_history_add(1027,22686 ! dir_history_next(1040,22942 ! dir_history_prev(1053,23175 ! clean_up(1066,23384 ! fatal(1084,23694 ! settitle(1094,23833 ! command_expand(1149,25308 ! refresh_after_suspend(1469,30855 ! add_to_environment(1519,31916 ! read_keys(1563,33083 ! main(1684,35815 gitkeys.c,200 --- 13,151 ---- fsusage.c,435 fs_adjust_blocks 64,1592 ! get_fs_usage 87,2219 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS96,2414 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS104,2636 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS117,3088 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS125,3284 ! # define CONVERT_BLOCKS(CONVERT_BLOCKS137,3695 ! # define CONVERT_BLOCKS(CONVERT_BLOCKS139,3776 ! # define f_bavail 142,3944 ! #define CONVERT_BLOCKS(CONVERT_BLOCKS155,4179 ! statfs 174,4743 ! git.c,4746 #define HAVE_PUTENV 75,1693 #define MAX_STATIC_SIZE 87,1897 ! #define GIT_SCREEN_MODE 106,2286 ! #define GIT_TERMINAL_MODE 107,2320 ! #define BUILTIN_OPERATIONS 159,3436 ! #define BUILTIN_copy 161,3489 ! #define BUILTIN_move 162,3516 ! #define BUILTIN_make_directory 163,3543 ! #define BUILTIN_delete 164,3579 ! #define BUILTIN_exit 165,3608 ! #define BUILTIN_previous_history_element 166,3635 ! #define BUILTIN_tty_mode 167,3679 ! #define BUILTIN_refresh 168,3709 ! #define BUILTIN_switch_panels 169,3739 ! #define BUILTIN_next_history_element 170,3774 ! #define BUILTIN_panel_enable_next_mode 171,3816 ! #define BUILTIN_panel_enable_owner_group 172,3860 ! #define BUILTIN_panel_enable_date_time 173,3905 ! #define BUILTIN_panel_enable_size 174,3949 ! #define BUILTIN_panel_enable_mode 175,3988 ! #define BUILTIN_panel_enable_full_name 176,4027 ! #define BUILTIN_panel_sort_next_method 177,4071 ! #define BUILTIN_panel_sort_by_name 178,4115 ! #define BUILTIN_panel_sort_by_extension 179,4155 ! #define BUILTIN_panel_sort_by_size 180,4200 ! #define BUILTIN_panel_sort_by_date 181,4240 ! #define BUILTIN_panel_sort_by_mode 182,4280 ! #define BUILTIN_panel_sort_by_owner_id 183,4320 ! #define BUILTIN_panel_sort_by_group_id 184,4364 ! #define BUILTIN_panel_sort_by_owner_name 185,4408 ! #define BUILTIN_panel_sort_by_group_name 186,4453 ! #define BUILTIN_select_entry 187,4498 ! #define BUILTIN_entry_to_input_line 188,4533 ! #define BUILTIN_beginning_of_panel 189,4574 ! #define BUILTIN_end_of_panel 190,4614 ! #define BUILTIN_scroll_down 191,4649 ! #define BUILTIN_scroll_up 192,4683 ! #define BUILTIN_previous_line 193,4715 ! #define BUILTIN_next_line 194,4751 ! #define BUILTIN_other_panel 195,4783 ! #define BUILTIN_change_directory 196,4817 ! #define BUILTIN_hard_refresh 197,4855 ! #define BUILTIN_select_files_matching_pattern 198,4890 ! #define BUILTIN_unselect_files_matching_pattern 199,4940 ! #define BUILTIN_adapt_current_directory 200,4992 ! #define BUILTIN_adapt_other_directory 201,5037 ! #define BUILTIN_other_path_to_input_line 202,5080 ! #define BUILTIN_selected_entries_to_input_line 203,5125 ! #define BUILTIN_backward_char 204,5176 ! #define BUILTIN_forward_char 205,5212 ! #define BUILTIN_backward_word 206,5247 ! #define BUILTIN_forward_word 207,5283 ! #define BUILTIN_beginning_of_line 208,5318 ! #define BUILTIN_end_of_line 209,5357 ! #define BUILTIN_delete_char 210,5391 ! #define BUILTIN_backward_delete_char 211,5425 ! #define BUILTIN_kill_word 212,5467 ! #define BUILTIN_backward_kill_word 213,5499 ! #define BUILTIN_kill_line 214,5539 ! #define BUILTIN_kill_to_beginning_of_line 215,5571 ! #define BUILTIN_kill_to_end_of_line 216,5617 ! #define BUILTIN_just_one_space 217,5658 ! #define BUILTIN_delete_horizontal_space 218,5695 ! #define BUILTIN_downcase_word 219,5740 ! #define BUILTIN_upcase_word 220,5776 ! #define BUILTIN_capitalize_word 221,5810 ! #define BUILTIN_action 222,5848 ! #define BUILTIN_set_mark 223,5878 ! #define BUILTIN_kill_region 224,5909 ! #define BUILTIN_kill_ring_save 225,5943 ! #define BUILTIN_yank 226,5980 ! #define BUILTIN_exchange_point_and_mark 227,6008 ! #define BUILTIN_set_scroll_step 228,6053 ! #define BUILTIN_isearch_backward 229,6091 ! #define BUILTIN_isearch_forward 230,6129 ! #define BUILTIN_previous_directory 231,6167 ! #define BUILTIN_next_directory 232,6207 ! #define BUILTIN_reset_directory_history 233,6244 ! #define BUILTIN_enlarge_panel 234,6289 ! #define BUILTIN_enlarge_other_panel 235,6325 ! #define BUILTIN_two_panels 236,6366 ! #define BUILTIN_lock 237,6399 ! #define BUILTIN_quick_compare_panels 238,6427 ! #define BUILTIN_thorough_compare_panels 239,6469 ! #define BUILTIN_name_downcase 240,6514 ! #define BUILTIN_name_upcase 241,6550 ! #define BUILTIN_up_one_dir 242,6584 ! #define BUILTIN_compare 243,6617 ! #define BUILTIN_bin_packing 244,6648 ! #define MAX_BUILTIN_NAME 247,6684 ! } command_t;command_t353,9495 ! #define MAX_KEYS 356,9510 ! #define KEYSDATA_FIELDS 357,9565 ! #define TITLE_FIELDS 360,9596 ! #define TitleForeground 383,9999 ! #define TitleBackground 384,10038 ! #define TitleBrightness 385,10077 ! #define UserName 386,10116 ! #define TtyName 387,10155 ! #define IL_ISEARCH_BEGIN 395,10330 ! #define IL_ISEARCH_BACKWARD 396,10364 ! #define IL_ISEARCH_FORWARD 397,10398 ! #define IL_ISEARCH_END 398,10432 ! il_history_add_entry(414,10859 ! il_history_view_entry(435,11210 ! il_dispatch_commands(454,11704 ! il_fix_text(588,14080 ! il_build_help_from_string(621,14630 ! il_read_char(655,15435 ! il_read_line(766,17317 ! il_isearch(910,20409 ! dir_history_reset(1014,22455 ! dir_history_add(1033,22695 ! dir_history_next(1046,22951 ! dir_history_prev(1059,23184 ! clean_up(1072,23393 ! fatal(1090,23703 ! settitle(1100,23842 ! command_expand(1155,25317 ! refresh_after_suspend(1475,30864 ! add_to_environment(1525,31946 ! read_keys(1571,33131 ! main(1692,35791 gitkeys.c,200 *************** *** 221,225 **** panic(566,11647 read_keys(574,11713 ! main(639,13111 gitview.c,1292 --- 222,226 ---- panic(566,11647 read_keys(574,11713 ! main(639,13039 gitview.c,1292 *************** *** 266,270 **** panic(348,7822 read_keys(356,7888 ! main(421,9290 gitwipe.c,124 --- 267,271 ---- panic(348,7822 read_keys(356,7888 ! main(421,9218 gitwipe.c,124 *************** *** 440,451 **** truncate_long_name(454,9193 truncate_string(471,9485 ! get_file_length(483,9692 ! get_local_time(496,9897 ! putenv(565,11906 ! is_a_bg_command(620,13016 ! is_an_empty_command(648,13541 ! get_file_type_info(660,13679 ! panel.c,4336 #define INT_MAX 51,1312 #define FILE_DISPLAY_MODES 101,2237 --- 441,452 ---- truncate_long_name(454,9193 truncate_string(471,9485 ! get_file_length(483,9703 ! get_local_time(496,9908 ! putenv(565,11917 ! is_a_bg_command(620,13027 ! is_an_empty_command(648,13552 ! get_file_type_info(660,13690 ! panel.c,4535 #define INT_MAX 51,1312 #define FILE_DISPLAY_MODES 101,2237 *************** *** 491,589 **** get_centered_fos(425,10733 cutname(445,11181 ! qcompare(463,11489 ! panel_no_optimizations(548,13557 ! panel_get_current_file_name(556,13653 ! panel_get_current_file_uid(564,13772 ! panel_get_current_file_gid(572,13889 ! panel_get_current_file_mode(580,14007 ! panel_get_current_file_type(588,14124 ! panel_set_position(596,14242 ! panel_activate(606,14397 ! panel_deactivate(614,14471 ! panel_set_wrapped_isearch_flag(622,14547 ! panel_isearch_backward(630,14644 ! panel_isearch_forward(653,15040 ! #define panel_1s_message 675,15442 ! panel_2s_message(679,15487 ! panel_3s_message(696,15819 ! panel_recover(714,16204 ! load_fti(734,16662 ! load_inode(769,17516 ! panel_read_directory(881,20572 ! panel_init_iterator(1155,26647 ! panel_get_next(1164,26780 ! panel_update_entries(1195,27329 ! panel_update_path(1228,27984 ! beautify_size_number(1265,28783 ! panel_update_size(1283,29018 ! mode2string(1324,29725 ! panel_update_info(1396,31017 ! panel_build_entry_field(1476,32884 ! panel_update_entry(1547,34416 ! panel_update_frame(1726,38952 ! panel_update(1768,39804 ! panel_resize(1780,40002 ! panel_set_focus(1800,40365 ! panel_select_all(1814,40596 ! panel_unselect_all(1830,40860 ! panel_get_path(1843,41036 ! canceled(1851,41109 ! same_file(1878,41553 ! #define WARN_OVERWRITE 1895,41797 ! #define WARN_OK 1896,41822 ! #define WARN_CANCEL 1897,41841 ! #define WARN_SKIP 1898,41863 ! panel_warning(1902,41889 ! panel_unlink(1946,42628 ! #define COPY_BUFFER_SIZE 1958,42916 ! #define SD_OK 1960,42954 ! #define SD_CANCEL 1961,42977 ! #define SD_SKIP 1962,43007 ! #define S_OPENERR 1963,43034 ! #define S_READERR 1964,43055 ! #define D_CREATERR 1965,43076 ! #define D_WRITEERR 1966,43098 ! #define SD_NOSPACE 1967,43120 ! #define SD_UNKNOWN 1968,43142 ! #define D_STATERR 1969,43164 ! #define SD_INVAL 1970,43185 ! percent(1990,43554 ! panel_copy(2003,43751 ! #define FT_OK 2233,48328 ! #define FT_CANCEL 2234,48360 ! #define FT_SKIP 2235,48396 ! #define T_CREATERR 2236,48430 ! #define F_DELETERR 2237,48456 ! #define F_STATERR 2238,48482 ! #define T_STATERR 2239,48508 ! #define FT_UNKNOWN 2240,48534 ! #define FT_INVAL 2241,48560 ! panel_move(2259,48855 ! panel_get_index(2443,52595 ! panel_act_ENTER(2484,53295 ! panel_act_COPY(2588,55275 ! panel_act_DELETE(2742,58494 ! panel_act_MKDIR(2867,61104 ! panel_act_MOVE(2928,62491 ! panel_act_CHDIR(3097,66003 ! panel_act_REFRESH(3131,66774 ! #define CMP_BUFFER_SIZE 3167,67504 ! #define CF_ABORT 3169,67541 ! #define CF_READ1 3170,67561 ! #define CF_READ2 3171,67581 ! #define CF_OPEN1 3172,67601 ! #define CF_OPEN2 3173,67621 ! panel_compare_files(3193,68176 ! panel_act_COMPARE(3310,70512 ! panel_act_CMPDIR(3425,73548 ! #define ON_OK 3513,75468 ! #define ON_CANCEL 3514,75491 ! #define ON_SKIP 3515,75521 ! #define O_RMERR 3516,75548 ! #define N_RMERR 3517,75567 ! #define ON_RENERR 3518,75586 ! panel_case_rename(3533,75755 ! panel_act_CASE(3643,77767 ! panel_action(3688,78675 signals.c,143 --- 492,596 ---- get_centered_fos(425,10733 cutname(445,11181 ! sort_compare_fn(463,11489 ! panel_no_optimizations(548,13564 ! panel_get_current_file_name(556,13660 ! panel_get_current_file_uid(564,13779 ! panel_get_current_file_gid(572,13896 ! panel_get_current_file_mode(580,14014 ! panel_get_current_file_type(588,14131 ! panel_set_position(596,14249 ! panel_activate(606,14404 ! panel_deactivate(614,14478 ! panel_set_wrapped_isearch_flag(622,14554 ! panel_isearch_backward(630,14651 ! panel_isearch_forward(653,15047 ! #define panel_1s_message 675,15449 ! panel_2s_message(679,15494 ! panel_3s_message(696,15826 ! panel_recover(714,16211 ! load_fti(734,16669 ! load_inode(769,17523 ! panel_read_directory(881,20579 ! panel_init_iterator(1156,26675 ! panel_get_next(1165,26808 ! panel_update_entries(1196,27357 ! panel_update_path(1229,28012 ! beautify_size_number(1266,28811 ! panel_update_size(1284,29046 ! mode2string(1325,29785 ! panel_update_info(1397,31077 ! panel_build_entry_field(1477,32944 ! panel_update_entry(1548,34476 ! panel_update_frame(1727,39012 ! panel_update(1769,39864 ! panel_resize(1781,40062 ! panel_set_focus(1801,40425 ! panel_select_all(1815,40656 ! panel_unselect_all(1831,40920 ! panel_get_path(1844,41096 ! canceled(1852,41169 ! same_file(1879,41613 ! #define WARN_OVERWRITE 1896,41857 ! #define WARN_OK 1897,41882 ! #define WARN_CANCEL 1898,41901 ! #define WARN_SKIP 1899,41923 ! panel_warning(1903,41949 ! panel_unlink(1947,42688 ! #define COPY_BUFFER_SIZE 1959,42976 ! #define SD_OK 1961,43014 ! #define SD_CANCEL 1962,43037 ! #define SD_SKIP 1963,43067 ! #define S_OPENERR 1964,43094 ! #define S_READERR 1965,43115 ! #define D_CREATERR 1966,43136 ! #define D_WRITEERR 1967,43158 ! #define SD_NOSPACE 1968,43180 ! #define SD_UNKNOWN 1969,43202 ! #define D_STATERR 1970,43224 ! #define SD_INVAL 1971,43245 ! percent(1991,43615 ! panel_copy(2004,43812 ! #define FT_OK 2229,48342 ! #define FT_CANCEL 2230,48365 ! #define FT_SKIP 2231,48395 ! #define T_CREATERR 2232,48422 ! #define F_DELETERR 2233,48444 ! #define F_STATERR 2234,48466 ! #define T_STATERR 2235,48487 ! #define FT_UNKNOWN 2236,48508 ! #define FT_INVAL 2237,48530 ! #define FT_NOSPACE 2238,48550 ! #define FT_COPY 2239,48572 ! panel_move(2259,48921 ! panel_get_index(2446,52752 ! panel_act_ENTER(2487,53452 ! panel_act_COPY(2591,55432 ! panel_act_DELETE(2746,58667 ! panel_act_MKDIR(2872,61339 ! panel_act_MOVE(2933,62726 ! panel_act_CHDIR(3104,66309 ! panel_act_REFRESH(3138,67080 ! #define CMP_BUFFER_SIZE 3174,67810 ! #define CF_ABORT 3176,67847 ! #define CF_READ1 3177,67867 ! #define CF_READ2 3178,67887 ! #define CF_OPEN1 3179,67907 ! #define CF_OPEN2 3180,67927 ! panel_compare_files(3200,68482 ! panel_act_COMPARE(3317,70818 ! panel_act_CMPDIR(3432,73835 ! #define ON_OK 3520,75754 ! #define ON_CANCEL 3521,75777 ! #define ON_SKIP 3522,75807 ! #define O_RMERR 3523,75834 ! #define N_RMERR 3524,75853 ! #define ON_RENERR 3525,75872 ! panel_case_rename(3540,76041 ! panel_act_CASE(3650,78045 ! pack_compare_fn(3699,79036 ! panel_act_BIN_PACKING(3721,79842 ! panel_parse_patterns(3872,83537 ! panel_deallocate_patterns(3929,84683 ! panel_action(3942,84858 signals.c,143 *************** *** 593,598 **** signals_dfl(96,1864 signals(105,1979 ! ignore_signals(116,2231 ! restore_signals(129,2469 status.c,489 --- 600,605 ---- signals_dfl(96,1864 signals(105,1979 ! ignore_signals(129,2385 ! restore_signals(142,2623 status.c,489 *************** *** 860,864 **** } HISTORY_STATE;HISTORY_STATE15,598 ! inputline.h,654 #define _GIT_INPUTLINE_H23,900 #define IL_RECORD 36,1040 --- 867,871 ---- } HISTORY_STATE;HISTORY_STATE15,598 ! inputline.h,679 #define _GIT_INPUTLINE_H23,900 #define IL_RECORD 36,1040 *************** *** 869,885 **** #define IL_STORE 43,1172 #define IL_KILL 44,1198 ! #define IL_FREEZED 48,1287 ! #define IL_EDIT 49,1314 ! #define IL_MOVE 50,1341 ! #define IL_BEEP 51,1368 ! #define IL_ERROR 52,1395 ! #define IL_SAVE 53,1422 ! #define IL_ISEARCH_ACTION_FAILED 55,1450 ! #define IL_ISEARCH_ACTION_NONE 56,1492 ! #define IL_ISEARCH_ACTION_DECREASE 57,1534 ! #define IL_ISEARCH_ACTION_RETRY 58,1576 ! #define IL_ISEARCH_ACTION_INCREASE 59,1618 ! #define IL_UPDATE 61,1661 ! } input_line_t;input_line_t80,2460 misc.h,245 --- 876,893 ---- #define IL_STORE 43,1172 #define IL_KILL 44,1198 ! #define IL_FREEZED 48,1287 ! #define IL_EDIT 49,1309 ! #define IL_MOVE 50,1329 ! #define IL_BEEP 51,1349 ! #define IL_ERROR 52,1369 ! #define IL_SAVE 53,1389 ! #define IL_HOME 54,1409 ! #define IL_ISEARCH_ACTION_FAILED 56,1430 ! #define IL_ISEARCH_ACTION_NONE 57,1472 ! #define IL_ISEARCH_ACTION_DECREASE 58,1514 ! #define IL_ISEARCH_ACTION_RETRY 59,1556 ! #define IL_ISEARCH_ACTION_INCREASE 60,1598 ! #define IL_UPDATE 62,1641 ! } input_line_t;input_line_t81,2440 misc.h,245 *************** *** 892,896 **** } file_type_info_t;file_type_info_t88,1974 ! panel.h,2622 #define _GIT_PANEL_H23,908 #define NAMLEN(NAMLEN40,1112 --- 900,904 ---- } file_type_info_t;file_type_info_t88,1974 ! panel.h,2656 #define _GIT_PANEL_H23,908 #define NAMLEN(NAMLEN40,1112 *************** *** 944,977 **** #define act_UP_ONE_DIR 114,2758 #define act_COMPARE 116,2786 ! #define SORT_BY_NAME 120,2838 ! #define SORT_BY_EXTENSION 121,2862 ! #define SORT_BY_SIZE 122,2890 ! #define SORT_BY_DATE 123,2914 ! #define SORT_BY_MODE 124,2938 ! #define SORT_BY_OWNER_ID 125,2962 ! #define SORT_BY_GROUP_ID 126,2989 ! #define SORT_BY_OWNER_NAME 127,3016 ! #define SORT_BY_GROUP_NAME 128,3045 ! #define ENABLE_OWNER_GROUP 132,3103 ! #define ENABLE_DATE_TIME 133,3132 ! #define ENABLE_SIZE 134,3159 ! #define ENABLE_MODE 135,3182 ! #define ENABLE_FULL_NAME 136,3205 ! #define ENABLE_ALL 137,3232 ! #define DIR_ENTRY 141,3275 ! #define FILE_ENTRY 142,3296 ! #define SYMLINK_ENTRY 143,3318 ! #define FIFO_ENTRY 144,3343 ! #define SOCKET_ENTRY 145,3365 ! #define ACTIVE_PANEL_MARKER 149,3425 ! #define INACTIVE_PANEL_MARKER 150,3457 ! #define CMPDIR_THOROUGH 154,3518 ! #define CMPDIR_QUICK 155,3545 ! #define CASE_DOWN 159,3601 ! #define CASE_UP 160,3622 ! } isearch_t;isearch_t169,3873 ! } isearch_aux_t;isearch_aux_t178,4153 ! } dir_entry_t;dir_entry_t199,4478 ! } panel_t;panel_t236,6062 signals.h,76 --- 952,986 ---- #define act_UP_ONE_DIR 114,2758 #define act_COMPARE 116,2786 ! #define act_BIN_PACKING 118,2811 ! #define SORT_BY_NAME 122,2867 ! #define SORT_BY_EXTENSION 123,2891 ! #define SORT_BY_SIZE 124,2919 ! #define SORT_BY_DATE 125,2943 ! #define SORT_BY_MODE 126,2967 ! #define SORT_BY_OWNER_ID 127,2991 ! #define SORT_BY_GROUP_ID 128,3018 ! #define SORT_BY_OWNER_NAME 129,3045 ! #define SORT_BY_GROUP_NAME 130,3074 ! #define ENABLE_OWNER_GROUP 134,3132 ! #define ENABLE_DATE_TIME 135,3161 ! #define ENABLE_SIZE 136,3188 ! #define ENABLE_MODE 137,3211 ! #define ENABLE_FULL_NAME 138,3234 ! #define ENABLE_ALL 139,3261 ! #define DIR_ENTRY 143,3304 ! #define FILE_ENTRY 144,3325 ! #define SYMLINK_ENTRY 145,3347 ! #define FIFO_ENTRY 146,3372 ! #define SOCKET_ENTRY 147,3394 ! #define ACTIVE_PANEL_MARKER 151,3454 ! #define INACTIVE_PANEL_MARKER 152,3486 ! #define CMPDIR_THOROUGH 156,3547 ! #define CMPDIR_QUICK 157,3574 ! #define CASE_DOWN 161,3630 ! #define CASE_UP 162,3651 ! } isearch_t;isearch_t171,3902 ! } isearch_aux_t;isearch_aux_t180,4182 ! } dir_entry_t;dir_entry_t201,4507 ! } panel_t;panel_t238,6091 signals.h,76 diff -rc2P git-4.3.14/src/fsusage.c /home/tudor/src/git/git-4.3.15/src/fsusage.c *** git-4.3.14/src/fsusage.c Mon Nov 11 20:41:00 1996 --- /home/tudor/src/git/git-4.3.15/src/fsusage.c Fri Dec 20 17:39:07 1996 *************** *** 63,80 **** long fs_adjust_blocks (blocks, fromsize, tosize) ! long blocks; ! int fromsize, tosize; { ! if (tosize <= 0) ! abort (); ! if (fromsize <= 0) ! return -1; ! ! if (fromsize == tosize) /* E.g., from 512 to 512. */ ! return blocks; ! else if (fromsize > tosize) /* E.g., from 2048 to 512. */ ! return blocks * (fromsize / tosize); ! else /* E.g., from 256 to 512. */ ! return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize); } --- 63,81 ---- long fs_adjust_blocks (blocks, fromsize, tosize) ! long blocks; ! int fromsize, tosize; { ! if (tosize <= 0) ! abort (); ! ! if (fromsize <= 0) ! return -1; ! ! if (fromsize == tosize) /* E.g., from 512 to 512. */ ! return blocks; ! else if (fromsize > tosize) /* E.g., from 2048 to 512. */ ! return blocks * (fromsize / tosize); ! else /* E.g., from 256 to 512. */ ! return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize); } *************** *** 85,136 **** int get_fs_usage (path, fsp) ! char *path; ! struct fs_usage *fsp; { #if defined (STAT_STATFS3_OSF1) ! struct statfs fsd; ! if (statfs (path, &fsd, sizeof (struct statfs)) != 0) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_fsize, 512) #endif /* STAT_STATFS3_OSF1 */ #ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ ! struct fs_data fsd; ! if (statfs (path, &fsd) != 1) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), 1024, 512) ! fsp->fsu_blocks = CONVERT_BLOCKS (fsd.fd_req.btot); ! fsp->fsu_bfree = CONVERT_BLOCKS (fsd.fd_req.bfree); ! fsp->fsu_bavail = CONVERT_BLOCKS (fsd.fd_req.bfreen); ! fsp->fsu_files = fsd.fd_req.gtot; ! fsp->fsu_ffree = fsd.fd_req.gfree; #endif #ifdef STAT_STATFS2_BSIZE /* 4.3BSD, SunOS 4, HP-UX, AIX. */ ! struct statfs fsd; ! if (statfs (path, &fsd) < 0) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_bsize, 512) #endif #ifdef STAT_STATFS2_FSIZE /* 4.4BSD. */ ! struct statfs fsd; ! if (statfs (path, &fsd) < 0) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_fsize, 512) #endif #ifdef STAT_STATFS4 /* SVR3, Dynix, Irix, AIX. */ ! struct statfs fsd; ! if (statfs (path, &fsd, sizeof fsd, 0) < 0) ! return -1; ! /* Empirically, the block counts on most SVR3 and SVR3-derived ! systems seem to always be in terms of 512-byte blocks, ! no matter what value f_bsize has. */ # if _AIX # define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_bsize, 512) --- 86,137 ---- int get_fs_usage (path, fsp) ! char *path; ! struct fs_usage *fsp; { #if defined (STAT_STATFS3_OSF1) ! struct statfs fsd; ! if (statfs (path, &fsd, sizeof (struct statfs)) != 0) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_fsize, 512) #endif /* STAT_STATFS3_OSF1 */ #ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ ! struct fs_data fsd; ! if (statfs (path, &fsd) != 1) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), 1024, 512) ! fsp->fsu_blocks = CONVERT_BLOCKS (fsd.fd_req.btot); ! fsp->fsu_bfree = CONVERT_BLOCKS (fsd.fd_req.bfree); ! fsp->fsu_bavail = CONVERT_BLOCKS (fsd.fd_req.bfreen); ! fsp->fsu_files = fsd.fd_req.gtot; ! fsp->fsu_ffree = fsd.fd_req.gfree; #endif #ifdef STAT_STATFS2_BSIZE /* 4.3BSD, SunOS 4, HP-UX, AIX. */ ! struct statfs fsd; ! if (statfs (path, &fsd) < 0) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_bsize, 512) #endif #ifdef STAT_STATFS2_FSIZE /* 4.4BSD. */ ! struct statfs fsd; ! if (statfs (path, &fsd) < 0) ! return -1; #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_fsize, 512) #endif #ifdef STAT_STATFS4 /* SVR3, Dynix, Irix, AIX. */ ! struct statfs fsd; ! if (statfs (path, &fsd, sizeof fsd, 0) < 0) ! return -1; ! /* Empirically, the block counts on most SVR3 and SVR3-derived ! systems seem to always be in terms of 512-byte blocks, ! no matter what value f_bsize has. */ # if _AIX # define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), (int)fsd.f_bsize, 512) *************** *** 146,167 **** #ifdef STAT_STATVFS /* SVR4. */ ! struct statvfs fsd; ! if (statvfs (path, &fsd) < 0) ! return -1; ! /* f_frsize isn't guaranteed to be supported. */ #define CONVERT_BLOCKS(b) \ ! fs_adjust_blocks ((b), fsd.f_frsize?(int)fsd.f_frsize:(int)fsd.f_bsize, 512) #endif #if defined(CONVERT_BLOCKS) && !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) /* !Ultrix && !SVR2. */ ! fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks); ! fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree); ! fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail); ! fsp->fsu_files = fsd.f_files; ! fsp->fsu_ffree = fsd.f_ffree; #endif ! return 0; } --- 147,169 ---- #ifdef STAT_STATVFS /* SVR4. */ ! struct statvfs fsd; ! ! if (statvfs (path, &fsd) < 0) ! return -1; ! /* f_frsize isn't guaranteed to be supported. */ #define CONVERT_BLOCKS(b) \ ! fs_adjust_blocks((b), fsd.f_frsize?(int)fsd.f_frsize:(int)fsd.f_bsize, 512) #endif #if defined(CONVERT_BLOCKS) && !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) /* !Ultrix && !SVR2. */ ! fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks); ! fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree); ! fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail); ! fsp->fsu_files = fsd.f_files; ! fsp->fsu_ffree = fsd.f_ffree; #endif ! return 0; } *************** *** 171,194 **** int statfs (path, fsb) ! char *path; ! struct statfs *fsb; { ! struct stat stats; ! struct dustat fsd; ! if (xstat (path, &stats)) ! return -1; ! if (dustat (stats.st_dev, 0, &fsd, sizeof (fsd))) ! return -1; ! fsb->f_type = 0; ! fsb->f_bsize = fsd.du_bsize; ! fsb->f_blocks = fsd.du_fsize - fsd.du_isize; ! fsb->f_bfree = fsd.du_tfree; ! fsb->f_bavail = fsd.du_tfree; ! fsb->f_files = (fsd.du_isize - 2) * fsd.du_inopb; ! fsb->f_ffree = fsd.du_tinode; ! fsb->f_fsid.val[0] = fsd.du_site; ! fsb->f_fsid.val[1] = fsd.du_pckno; ! return 0; } #endif /* _AIX && _I386 */ --- 173,199 ---- int statfs (path, fsb) ! char *path; ! struct statfs *fsb; { ! struct stat stats; ! struct dustat fsd; ! ! if (xstat(path, &stats)) ! return -1; ! ! if (dustat(stats.st_dev, 0, &fsd, sizeof (fsd))) ! return -1; ! ! fsb->f_type = 0; ! fsb->f_bsize = fsd.du_bsize; ! fsb->f_blocks = fsd.du_fsize - fsd.du_isize; ! fsb->f_bfree = fsd.du_tfree; ! fsb->f_bavail = fsd.du_tfree; ! fsb->f_files = (fsd.du_isize - 2) * fsd.du_inopb; ! fsb->f_ffree = fsd.du_tinode; ! fsb->f_fsid.val[0] = fsd.du_site; ! fsb->f_fsid.val[1] = fsd.du_pckno; ! return 0; } #endif /* _AIX && _I386 */ diff -rc2P git-4.3.14/src/git.c /home/tudor/src/git/git-4.3.15/src/git.c *** git-4.3.14/src/git.c Tue Dec 3 14:52:59 1996 --- /home/tudor/src/git/git-4.3.15/src/git.c Mon Dec 23 16:36:39 1996 *************** *** 101,106 **** int TypeSensitivity = ON; ! /* These are the only possible current_mode values. Used while resuming ! from suspended mode in order to correctly refresh the display. */ #define GIT_SCREEN_MODE 0 #define GIT_TERMINAL_MODE 1 --- 101,107 ---- int TypeSensitivity = ON; ! /* These are the only possible values for `current_mode'. Used while ! resuming from suspended mode in order to correctly refresh the ! display. */ #define GIT_SCREEN_MODE 0 #define GIT_TERMINAL_MODE 1 *************** *** 125,129 **** char title[] = " "PRODUCT" "VERSION; #else ! char title[] = " GNU Interactive Tools 4.3.14"; #endif /* !HAVE_GCC */ --- 126,130 ---- char title[] = " "PRODUCT" "VERSION; #else ! char title[] = " GNU Interactive Tools 4.3.15"; #endif /* !HAVE_GCC */ *************** *** 156,160 **** int dir_history_point; ! #define BUILTIN_OPERATIONS 83 #define BUILTIN_copy -1 --- 157,161 ---- int dir_history_point; ! #define BUILTIN_OPERATIONS 84 #define BUILTIN_copy -1 *************** *** 241,244 **** --- 242,246 ---- #define BUILTIN_up_one_dir -82 #define BUILTIN_compare -83 + #define BUILTIN_bin_packing -84 *************** *** 331,334 **** --- 333,337 ---- "up-one-dir", "compare", + "bin-packing", }; *************** *** 678,681 **** --- 681,687 ---- il_insert_text(text); + if (flags & IL_HOME) + il_beginning_of_line(); + xfree(text); *************** *** 855,863 **** tty_beep(); /* Well, there use to be a `goto done;' here, ! but some people prefer to be able to ! continue editing the current line after ! accidentally hitting an unrelated key. I ! guess we will restore the original ! behaviour. */ } --- 861,869 ---- tty_beep(); /* Well, there use to be a `goto done;' here, ! but some people prefer to be able to ! continue editing the current line after ! accidentally hitting an unrelated key. I ! guess we will restore the original ! behaviour. */ } *************** *** 1475,1479 **** if (mode == GIT_SCREEN_MODE) { ! /* switch back to noncanonical mode. */ tty_set_mode(TTY_NONCANONIC); tty_defaults(); --- 1481,1485 ---- if (mode == GIT_SCREEN_MODE) { ! /* Switch back to noncanonical mode. */ tty_set_mode(TTY_NONCANONIC); tty_defaults(); *************** *** 1492,1499 **** il_get_contents(&cmdln); il_reset_line(); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), ! PWD, MAX_STATIC_SIZE), ! PS1)); il_insert_text(cmdln); il_full_update(); --- 1498,1505 ---- il_get_contents(&cmdln); il_reset_line(); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), ! PWD, MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); il_insert_text(cmdln); il_full_update(); *************** *** 1503,1507 **** else { ! /* switch back to noncanonical mode. */ tty_set_mode(TTY_NONCANONIC); tty_defaults(); --- 1509,1513 ---- else { ! /* Switch back to noncanonical mode. */ tty_set_mode(TTY_NONCANONIC); tty_defaults(); *************** *** 1518,1522 **** void add_to_environment(variable, alternate_variable, value) ! char *variable, *alternate_variable, *value; { int result; --- 1524,1530 ---- void add_to_environment(variable, alternate_variable, value) ! char *variable; ! char *alternate_variable; ! char *value; { int result; *************** *** 1590,1597 **** if (*key_seq_ptr == '\0') continue; ! /* We got the key sequence in the correct form, as ! returned by tgetstr, so there is no need for ! further conversion. */ strcpy(key_seq, key_seq_ptr); need_conversion = 0; --- 1598,1605 ---- if (*key_seq_ptr == '\0') continue; ! /* We got the key sequence in the correct form, as ! returned by tgetstr, so there is no need for ! further conversion. */ strcpy(key_seq, key_seq_ptr); need_conversion = 0; *************** *** 1600,1606 **** { /* This is not a TERMCAP symbol, it is a key sequence ! that we will have to convert it with ! tty_key_convert() into a machine usable form before ! using it. */ need_conversion = 1; } --- 1608,1614 ---- { /* This is not a TERMCAP symbol, it is a key sequence ! that we will have to convert it with ! tty_key_convert() into a machine usable form before ! using it. */ need_conversion = 1; } *************** *** 1690,1695 **** size_t len = 0, ptrlen; int previous_isearch_failed; - input_line_t *saved_il = NULL; char PWD[MAX_STATIC_SIZE + 1]; char *lock_password, *unlock_password; int child_exit_code, repeat_count, keys; --- 1698,1703 ---- size_t len = 0, ptrlen; int previous_isearch_failed; char PWD[MAX_STATIC_SIZE + 1]; + input_line_t *saved_il = NULL; char *lock_password, *unlock_password; int child_exit_code, repeat_count, keys; *************** *** 1750,1754 **** add_to_environment("GIT_RMAIL", (char *)NULL, "emacs -f rmail"); add_to_environment("GIT_PAGER", (char *)NULL, "more"); - add_to_environment("GIT_COMPRESS", (char *)NULL, "gzip -r9"); add_to_environment("GIT_VMSTAT", (char *)NULL, "free"); --- 1758,1761 ---- *************** *** 1889,1896 **** signals(SIG_ON); ! il_set_static_text(strcat(truncate_string(panel_get_path(src_panel), ! PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); --- 1896,1903 ---- signals(SIG_ON); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); saved_il = il_save(); *************** *** 2055,2062 **** il_free(saved_il); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); break; --- 2062,2069 ---- il_free(saved_il); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); saved_il = il_save(); break; *************** *** 2152,2156 **** il_set_static_text( strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), PS1)); il_kill_line(IL_DONT_STORE); --- 2159,2163 ---- il_set_static_text( strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE-strlen(PS1)+1), PS1)); il_kill_line(IL_DONT_STORE); *************** *** 2527,2534 **** il_restore(saved_il); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); } --- 2534,2541 ---- il_restore(saved_il); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE-strlen(PS1)+1), ! PS1)); saved_il = il_save(); } *************** *** 2539,2544 **** signals(SIG_OFF); ! if (il_read_line("Select files matching pattern: ", ! &input, (char *)NULL, command->history)) { if (input[0] == 0) --- 2546,2552 ---- signals(SIG_OFF); ! if (il_read_line( ! "Select files matching one of the patterns: ", ! &input, (char *)NULL, command->history)) { if (input[0] == 0) *************** *** 2551,2555 **** input = NULL; } - break; --- 2559,2562 ---- *************** *** 2557,2562 **** signals(SIG_OFF); ! if (il_read_line("Unselect files matching pattern: ", ! &input, (char *)NULL, command->history)) { if (input[0] == 0) --- 2564,2570 ---- signals(SIG_OFF); ! if (il_read_line( ! "Unselect files matching one of the patterns: ", ! &input, (char *)NULL, command->history)) { if (input[0] == 0) *************** *** 2569,2573 **** input = NULL; } - break; --- 2577,2580 ---- *************** *** 2581,2588 **** il_free(saved_il); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); break; --- 2588,2595 ---- il_free(saved_il); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); saved_il = il_save(); break; *************** *** 2722,2729 **** il_restore(saved_il); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); break; --- 2729,2736 ---- il_restore(saved_il); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); saved_il = il_save(); break; *************** *** 2735,2742 **** il_restore(saved_il); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); break; --- 2742,2749 ---- il_restore(saved_il); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); saved_il = il_save(); break; *************** *** 2758,2765 **** il_free(saved_il); ! il_set_static_text(strcat( ! truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE), ! PS1)); saved_il = il_save(); --- 2765,2772 ---- il_free(saved_il); ! il_set_static_text( ! strcat(truncate_string(panel_get_path(src_panel), PWD, ! MAX_STATIC_SIZE - strlen(PS1) + 1), ! PS1)); saved_il = il_save(); *************** *** 2845,2849 **** break; ! case BUILTIN_quick_compare_panels: cmp_mode = CMPDIR_QUICK; panel_action(src_panel, act_CMPDIR, dest_panel, &cmp_mode, 1); --- 2852,2856 ---- break; ! case BUILTIN_quick_compare_panels: cmp_mode = CMPDIR_QUICK; panel_action(src_panel, act_CMPDIR, dest_panel, &cmp_mode, 1); *************** *** 2871,2874 **** --- 2878,2898 ---- case BUILTIN_compare: panel_action(src_panel, act_COMPARE, dest_panel, NULL, 1); + break; + + case BUILTIN_bin_packing: + signals(SIG_OFF); + + if (il_read_line("Bin size (in Kb): ", &input, "0", + command->history)) + { + if (input[0] == 0) + break; + + panel_action(src_panel, act_BIN_PACKING, + dest_panel, input, 1); + + xfree(input); + input = NULL; + } break; diff -rc2P git-4.3.14/src/gitaction /home/tudor/src/git/git-4.3.15/src/gitaction *** git-4.3.14/src/gitaction Wed Nov 20 14:29:57 1996 --- /home/tudor/src/git/git-4.3.15/src/gitaction Mon Dec 23 16:41:14 1996 *************** *** 1,7 **** ! #!/bin/sh ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 per file type action script ### ### Global version ### ### Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. ### --- 1,7 ---- ! #! /bin/sh ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 per file type action script ### ### Global version ### ### Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. ### *************** *** 40,46 **** ### name=`basename "$0"` ! if test "$#" -ne 2 -o ! -d "$1" -o ! -f "$2"; then echo "$name: GIT internal script" >&2 exit 1 --- 40,58 ---- ### + ### + ### Note: + ### Not all the programs called here are able to handle the -- command + ### line switch. These are: emacs, ghostview, tar, basename, ar, xv, + ### xanim, xfig, lynx, mpeg_vga, zip/unzip. There are some that I couldn't + ### test. + ### + ### When these programs will be fixed, we should add -- to them... + ### Until then, we will fail to run commands like `xfig -P -P' to + ### process a file called `-P'. + ### + name=`basename "$0"` ! if test "$#" -ne 2 || test ! -d "$1" || test ! -f "$2"; then echo "$name: GIT internal script" >&2 exit 1 *************** *** 73,77 **** case "$2" in ! *.[oO]) objdump --syms --all-headers "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *.a | *.sa) ar -tv "$2" | $GIT_PAGER; \ --- 85,89 ---- case "$2" in ! *.[oO]) objdump --syms --all-headers -- "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *.a | *.sa) ar -tv "$2" | $GIT_PAGER; \ *************** *** 82,89 **** *.t[arg]z |\ *.tar.[zZ]) (echo "Compressed file info:"; \ ! gunzip -l "$2"; \ echo; \ echo "Tar file info:"; \ ! gunzip -c "$2" | tar tvf - ) | $GIT_PAGER; \ echo "$msg"; read key;; *.man) nroff -man "$2" | $GIT_PAGER; \ --- 94,101 ---- *.t[arg]z |\ *.tar.[zZ]) (echo "Compressed file info:"; \ ! gunzip -l -- "$2"; \ echo; \ echo "Tar file info:"; \ ! gunzip -c -- "$2" | tar tvf -) | $GIT_PAGER; \ echo "$msg"; read key;; *.man) nroff -man "$2" | $GIT_PAGER; \ *************** *** 96,100 **** echo "$msg"; read key;; pubring.pgp |\ ! secring.pgp) pgp -kv "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *.fig | *.FIG) if test $DISPLAY; then \ --- 108,112 ---- echo "$msg"; read key;; pubring.pgp |\ ! secring.pgp) pgp -kv -- "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *.fig | *.FIG) if test $DISPLAY; then \ *************** *** 114,118 **** (xv "$2" > /dev/null 2>&1 &); \ else \ ! zgv "$2"; \ fi;; *.tif | *.TIF |\ --- 126,130 ---- (xv "$2" > /dev/null 2>&1 &); \ else \ ! zgv -- "$2"; \ fi;; *.tif | *.TIF |\ *************** *** 128,131 **** --- 140,144 ---- echo "$msg"; read key; \ fi;; + *.mov | *.MOV |\ *.avi | *.AVI) if test $DISPLAY; then \ (xanim "$2" > /dev/null 2>&1 &); \ *************** *** 140,148 **** mpeg_vga "$2"; \ fi;; *.avi.gz |\ *.AVI.gz |\ *.avi.[zZ] |\ *.AVI.[zZ]) if test $DISPLAY; then \ ! (gunzip -c "$2" | xanim > /dev/null 2>&1 &); \ else \ $GIT_PAGER "$2"; \ --- 153,166 ---- mpeg_vga "$2"; \ fi;; + *.mov.gz |\ + *.MOV.gz |\ + *.mov.[zZ] |\ + *.MOV.[zZ] |\ *.avi.gz |\ *.AVI.gz |\ *.avi.[zZ] |\ *.AVI.[zZ]) if test $DISPLAY; then \ ! (gunzip -c -- "$2" | \ ! xanim - > /dev/null 2>&1 &); \ else \ $GIT_PAGER "$2"; \ *************** *** 157,163 **** *.mpeg.[zZ] |\ *.MPEG.[zZ]) if test $DISPLAY; then \ ! (gunzip -c "$2" | xanim > /dev/null 2>&1 &); \ else \ ! gunzip -c "$2" | mpeg_vga; \ fi;; *.fli | *.FLI |\ --- 175,182 ---- *.mpeg.[zZ] |\ *.MPEG.[zZ]) if test $DISPLAY; then \ ! (gunzip -c -- "$2" | \ ! xanim - > /dev/null 2>&1 &); \ else \ ! gunzip -c -- "$2" | mpeg_vga; \ fi;; *.fli | *.FLI |\ *************** *** 175,181 **** *.flc.[zZ] |\ *.FLC.[zZ]) if test $DISPLAY; then \ ! (gunzip -c "$2" | xanim > /dev/null 2>&1 &); \ else \ ! gunzip -c "$2" | flip -; fi;; *.gl | *.GL) if test $DISPLAY; then \ --- 194,201 ---- *.flc.[zZ] |\ *.FLC.[zZ]) if test $DISPLAY; then \ ! (gunzip -c -- "$2" | \ ! xanim - > /dev/null 2>&1 &); \ else \ ! gunzip -c -- "$2" | flip -; fi;; *.gl | *.GL) if test $DISPLAY; then \ *************** *** 189,193 **** *.gl.[zZ] |\ *.GL.[zZ]) if test $DISPLAY; then \ ! (gunzip -c "$2" | xgrasp > /dev/null 2>&1 &); \ else \ $GIT_PAGER "$2"; \ --- 209,214 ---- *.gl.[zZ] |\ *.GL.[zZ]) if test $DISPLAY; then \ ! (gunzip -c -- "$2" | \ ! xgrasp > /dev/null 2>&1 &); \ else \ $GIT_PAGER "$2"; \ *************** *** 199,203 **** (ghostview "$2" > /dev/null 2>&1 &); \ else \ ! gs -sDEVICE=linux "$2"; \ fi;; *.dvi | *.DVI) if test $DISPLAY; then \ --- 220,224 ---- (ghostview "$2" > /dev/null 2>&1 &); \ else \ ! gs -sDEVICE=linux "$2"; \ fi;; *.dvi | *.DVI) if test $DISPLAY; then \ *************** *** 213,221 **** *.[1-9n][xXm].[zZ] |\ *.[1-9n].gz |\ ! *.[1-9n].[zZ]) gunzip -c "$2" | nroff -man | $GIT_PAGER; \ echo "$msg"; read key;; RMAIL) emacs -f rmail;; *.gz | *.GZ |\ ! *.[zZ]) gunzip -c "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *.zip | *.ZIP) unzip -v "$2" | $GIT_PAGER; \ --- 234,242 ---- *.[1-9n][xXm].[zZ] |\ *.[1-9n].gz |\ ! *.[1-9n].[zZ]) gunzip -c -- "$2" | nroff -man | $GIT_PAGER; \ echo "$msg"; read key;; RMAIL) emacs -f rmail;; *.gz | *.GZ |\ ! *.[zZ]) gunzip -c -- "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *.zip | *.ZIP) unzip -v "$2" | $GIT_PAGER; \ *************** *** 227,231 **** *.rar | *.RAR) unrar l "$2" | $GIT_PAGER; \ echo "$msg"; read key;; ! *.rpm | *.RPM) rpm -qilRsp "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *) $GIT_PAGER "$2"; \ --- 248,252 ---- *.rar | *.RAR) unrar l "$2" | $GIT_PAGER; \ echo "$msg"; read key;; ! *.rpm | *.RPM) rpm -qilRsp -- "$2" | $GIT_PAGER; \ echo "$msg"; read key;; *) $GIT_PAGER "$2"; \ diff -rc2P git-4.3.14/src/gitkeys.c /home/tudor/src/git/git-4.3.15/src/gitkeys.c *** git-4.3.14/src/gitkeys.c Wed Nov 20 14:30:07 1996 --- /home/tudor/src/git/git-4.3.15/src/gitkeys.c Fri Dec 20 17:41:24 1996 *************** *** 366,370 **** printf(PRODUCT" "VERSION" - Display key sequence utility\n"); #else ! printf("GNU Interactive Tools 4.3.14 - Display key sequence utility\n"); #endif /* !HAVE_GCC */ printf("GIT is free software; you can redistribute it and/or modify it under the\n"); --- 366,370 ---- printf(PRODUCT" "VERSION" - Display key sequence utility\n"); #else ! printf("GNU Interactive Tools 4.3.15 - Display key sequence utility\n"); #endif /* !HAVE_GCC */ printf("GIT is free software; you can redistribute it and/or modify it under the\n"); diff -rc2P git-4.3.14/src/gitmount /home/tudor/src/git/git-4.3.15/src/gitmount *** git-4.3.14/src/gitmount Wed Nov 20 14:30:13 1996 --- /home/tudor/src/git/git-4.3.15/src/gitmount Sat Dec 21 18:53:51 1996 *************** *** 1,7 **** ! #!/bin/sh ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 auto-mount script ### ### Copyright (C) 1994, 1996 Free Software Foundation, Inc. ### ### Written by Tudor Hulubei and Andrei Pitis. ### --- 1,7 ---- ! #! /bin/sh ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 auto-mount script ### ### Copyright (C) 1994, 1996 Free Software Foundation, Inc. ### ### Written by Tudor Hulubei and Andrei Pitis. ### diff -rc2P git-4.3.14/src/gitps.c /home/tudor/src/git/git-4.3.15/src/gitps.c *** git-4.3.14/src/gitps.c Wed Nov 20 14:29:21 1996 --- /home/tudor/src/git/git-4.3.15/src/gitps.c Fri Dec 20 17:41:44 1996 *************** *** 154,158 **** static char title_text[] = " "PRODUCT" "VERSION" - Process Viewer/Killer"; #else ! static char title_text[] = " GNU Interactive Tools 4.3.14 - Process Viewer/Killer"; #endif /* !HAVE_GCC */ static char *GitPsModeHelp; --- 154,158 ---- static char title_text[] = " "PRODUCT" "VERSION" - Process Viewer/Killer"; #else ! static char title_text[] = " GNU Interactive Tools 4.3.15 - Process Viewer/Killer"; #endif /* !HAVE_GCC */ static char *GitPsModeHelp; *************** *** 596,603 **** if (*key_seq_ptr == '\0') continue; ! /* We got the key sequence in the correct form, as ! returned by tgetstr, so there is no need for ! further conversion. */ strcpy(key_seq, key_seq_ptr); need_conversion = 0; --- 596,603 ---- if (*key_seq_ptr == '\0') continue; ! /* We got the key sequence in the correct form, as ! returned by tgetstr, so there is no need for ! further conversion. */ strcpy(key_seq, key_seq_ptr); need_conversion = 0; *************** *** 606,612 **** { /* This is not a TERMCAP symbol, it is a key sequence ! that we will have to convert it with ! tty_key_convert() into a machine usable form before ! using it. */ need_conversion = 1; } --- 606,612 ---- { /* This is not a TERMCAP symbol, it is a key sequence ! that we will have to convert it with ! tty_key_convert() into a machine usable form before ! using it. */ need_conversion = 1; } Only in git-4.3.14/src: gitredir diff -rc2P git-4.3.14/src/gitrgrep /home/tudor/src/git/git-4.3.15/src/gitrgrep *** git-4.3.14/src/gitrgrep Wed Nov 20 14:30:23 1996 --- /home/tudor/src/git/git-4.3.15/src/gitrgrep Sat Dec 21 18:56:21 1996 *************** *** 1,7 **** ! #!/bin/sh ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 recursive grep script ### ### Copyright (C) 1994, 1996 Free Software Foundation, Inc. ### ### Written by Tudor Hulubei and Andrei Pitis. ### --- 1,7 ---- ! #! /bin/sh ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 recursive grep script ### ### Copyright (C) 1994, 1996 Free Software Foundation, Inc. ### ### Written by Tudor Hulubei and Andrei Pitis. ### diff -rc2P git-4.3.14/src/gitview.c /home/tudor/src/git/git-4.3.15/src/gitview.c *** git-4.3.14/src/gitview.c Wed Nov 20 14:29:29 1996 --- /home/tudor/src/git/git-4.3.15/src/gitview.c Fri Dec 20 17:42:25 1996 *************** *** 196,200 **** static char title_text[] = " "PRODUCT" "VERSION" - Hex/Ascii File Viewer"; #else ! static char title_text[] = " GNU Interactive Tools 4.3.14 - Hex/Ascii File Viewer"; #endif /* !HAVE_GCC */ static char *GitViewModeHelp; --- 196,200 ---- static char title_text[] = " "PRODUCT" "VERSION" - Hex/Ascii File Viewer"; #else ! static char title_text[] = " GNU Interactive Tools 4.3.15 - Hex/Ascii File Viewer"; #endif /* !HAVE_GCC */ static char *GitViewModeHelp; *************** *** 378,385 **** if (*key_seq_ptr == '\0') continue; ! /* We got the key sequence in the correct form, as ! returned by tgetstr, so there is no need for ! further conversion. */ strcpy(key_seq, key_seq_ptr); need_conversion = 0; --- 378,385 ---- if (*key_seq_ptr == '\0') continue; ! /* We got the key sequence in the correct form, as ! returned by tgetstr, so there is no need for ! further conversion. */ strcpy(key_seq, key_seq_ptr); need_conversion = 0; *************** *** 388,394 **** { /* This is not a TERMCAP symbol, it is a key sequence ! that we will have to convert it with ! tty_key_convert() into a machine usable form before ! using it. */ need_conversion = 1; } --- 388,394 ---- { /* This is not a TERMCAP symbol, it is a key sequence ! that we will have to convert it with ! tty_key_convert() into a machine usable form before ! using it. */ need_conversion = 1; } diff -rc2P git-4.3.14/src/gitxgrep /home/tudor/src/git/git-4.3.15/src/gitxgrep *** git-4.3.14/src/gitxgrep Mon Apr 1 18:06:52 1996 --- /home/tudor/src/git/git-4.3.15/src/gitxgrep Sat Dec 21 18:54:01 1996 *************** *** 1,3 **** ! #!/bin/sh cd "$1" --- 1,3 ---- ! #! /bin/sh cd "$1" diff -rc2P git-4.3.14/src/inputline.h /home/tudor/src/git/git-4.3.15/src/inputline.h *** git-4.3.14/src/inputline.h Sat Sep 28 15:59:33 1996 --- /home/tudor/src/git/git-4.3.15/src/inputline.h Fri Dec 20 20:40:29 1996 *************** *** 46,55 **** /* Some #defines used in external input line interfaces. */ ! #define IL_FREEZED 0 ! #define IL_EDIT 1 ! #define IL_MOVE 2 ! #define IL_BEEP 4 ! #define IL_ERROR 8 ! #define IL_SAVE 16 #define IL_ISEARCH_ACTION_FAILED -1 --- 46,56 ---- /* Some #defines used in external input line interfaces. */ ! #define IL_FREEZED 0 ! #define IL_EDIT 1 ! #define IL_MOVE 2 ! #define IL_BEEP 4 ! #define IL_ERROR 8 ! #define IL_SAVE 16 ! #define IL_HOME 32 #define IL_ISEARCH_ACTION_FAILED -1 diff -rc2P git-4.3.14/src/misc.c /home/tudor/src/git/git-4.3.15/src/misc.c *** git-4.3.14/src/misc.c Mon Nov 11 17:32:17 1996 --- /home/tudor/src/git/git-4.3.15/src/misc.c Fri Dec 20 17:44:31 1996 *************** *** 474,479 **** size_t len; { ! truncate_long_name(path, temppath, len); ! temppath[min(len, strlen(path))] = 0; return temppath; } --- 474,479 ---- size_t len; { ! truncate_long_name(path, temppath, len - 1); ! temppath[min(len - 1, strlen(path))] = '\0'; return temppath; } diff -rc2P git-4.3.14/src/panel.c /home/tudor/src/git/git-4.3.15/src/panel.c *** git-4.3.14/src/panel.c Wed Dec 4 21:07:13 1996 --- /home/tudor/src/git/git-4.3.15/src/panel.c Mon Dec 23 14:14:25 1996 *************** *** 461,465 **** static int ! qcompare(_first, _second) const void *_first; const void *_second; --- 461,465 ---- static int ! sort_compare_fn(_first, _second) const void *_first; const void *_second; *************** *** 1142,1149 **** qsort(this->dir_entry + 1, this->entries - 1, ! sizeof(dir_entry_t), qcompare); } else ! qsort(this->dir_entry, this->entries, sizeof(dir_entry_t), qcompare); xfree(old_path); --- 1142,1150 ---- qsort(this->dir_entry + 1, this->entries - 1, ! sizeof(dir_entry_t), sort_compare_fn); } else ! qsort(this->dir_entry, this->entries, ! sizeof(dir_entry_t), sort_compare_fn); xfree(old_path); *************** *** 1284,1288 **** panel_t *this; { - int result; char sz[16]; tty_status_t status; --- 1285,1288 ---- *************** *** 1295,1301 **** fsu.fsu_blocks = -1; - result = get_fs_usage(this->path, &fsu); ! if (result < 0 || fsu.fsu_blocks == -1) { memset(sz, ' ', 14); --- 1295,1300 ---- fsu.fsu_blocks = -1; ! if (get_fs_usage(this->path, &fsu) < 0 || fsu.fsu_blocks == -1) { memset(sz, ' ', 14); *************** *** 1306,1310 **** else { ! beautify_size_number(sz, fsu.fsu_bavail * 512); tty_brightness(PanelDeviceFreeSpaceBrightness); --- 1305,1311 ---- else { ! long free_blocks = (geteuid() == 0) ? fsu.fsu_bfree : fsu.fsu_bavail; ! ! beautify_size_number(sz, free_blocks * 512); tty_brightness(PanelDeviceFreeSpaceBrightness); *************** *** 1983,1987 **** "unknown error", "cannot stat destination file", ! "cannot copy a directory to a non-directory" }; --- 1984,1988 ---- "unknown error", "cannot stat destination file", ! "cannot copy a directory to a non-directory", }; *************** *** 2060,2068 **** msg = xmalloc(32 + strlen(src)); ! sprintf(msg, "(COPY) [cp -r] %s", src); status(msg, 0, 0, 0, MSG_STATUS, 0); xfree(msg); ! sprintf(temp, "cp -r %s %s", src, dest); result = (start(temp, 1) == 0); xfree(temp); --- 2061,2069 ---- msg = xmalloc(32 + strlen(src)); ! sprintf(msg, "(COPY) [cp -r] \"%s\"", src); status(msg, 0, 0, 0, MSG_STATUS, 0); xfree(msg); ! sprintf(temp, "cp -r \"%s\" \"%s\"", src, dest); result = (start(temp, 1) == 0); xfree(temp); *************** *** 2191,2208 **** if (bytes_transferred != bytes_to_transfer) ! if (bytes_transferred >= 0) ! { ! close2(sfd, dfd); ! panel_unlink(dest); ! xfree2(buf, dest); ! return SD_NOSPACE; ! } ! else ! { ! close2(sfd, dfd); ! panel_unlink(dest); ! xfree2(buf, dest); ! return (errno == ENOSPC) ? SD_NOSPACE : D_WRITEERR; ! } if (n + bytes_to_transfer <= len) --- 2192,2204 ---- if (bytes_transferred != bytes_to_transfer) ! { ! int safe_errno = errno; ! ! close2(sfd, dfd); ! panel_unlink(dest); ! xfree2(buf, dest); ! return (bytes_transferred > 0) ? SD_NOSPACE : ! ((safe_errno == ENOSPC) ? SD_NOSPACE : D_WRITEERR); ! } if (n + bytes_to_transfer <= len) *************** *** 2231,2246 **** ! #define FT_OK WARN_OK ! #define FT_CANCEL WARN_CANCEL ! #define FT_SKIP WARN_SKIP ! #define T_CREATERR 4 ! #define F_DELETERR 5 ! #define F_STATERR 6 ! #define T_STATERR 7 ! #define FT_UNKNOWN 8 ! #define FT_INVAL 9 ! char *moveerr[9] = { "", --- 2227,2244 ---- ! #define FT_OK WARN_OK ! #define FT_CANCEL WARN_CANCEL ! #define FT_SKIP WARN_SKIP ! #define T_CREATERR 4 ! #define F_DELETERR 5 ! #define F_STATERR 6 ! #define T_STATERR 7 ! #define FT_UNKNOWN 8 ! #define FT_INVAL 9 ! #define FT_NOSPACE 10 ! #define FT_COPY 11 ! char *moveerr[11] = { "", *************** *** 2252,2256 **** "cannot stat destination directory", "unknown error", ! "cannot copy a directory to a non-directory" }; --- 2250,2256 ---- "cannot stat destination directory", "unknown error", ! "cannot copy a directory to a non-directory", ! "not enough space on device", ! "cannot copy file", }; *************** *** 2313,2321 **** msg = xmalloc(32 + strlen(from)); ! sprintf(msg, "(MOVE) [mv -f] %s", from); status(msg, 0, 0, 0, MSG_STATUS, 0); xfree(msg); ! sprintf(temp, "mv -f %s %s", from, to); result = (start(temp, 1) == 0); xfree(temp); --- 2313,2321 ---- msg = xmalloc(32 + strlen(from)); ! sprintf(msg, "(MOVE) [mv -f] \"%s\"", from); status(msg, 0, 0, 0, MSG_STATUS, 0); xfree(msg); ! sprintf(temp, "mv -f \"%s\" \"%s\"", from, to); result = (start(temp, 1) == 0); xfree(temp); *************** *** 2408,2422 **** from_statbuf.st_gid); ! if (error == SD_OK) ! goto remove_from; ! ! if (error == SD_CANCEL) ! return FT_CANCEL; ! ! if (error == SD_SKIP) ! return FT_SKIP; ! ! panel_3s_message("%s: Copy failed, %s.", from, copyerr[error - 1], ! (char *)NULL, IL_MOVE | IL_BEEP | IL_ERROR); return FT_OK; --- 2408,2425 ---- from_statbuf.st_gid); ! switch (error) ! { ! case SD_OK: goto remove_from; ! case SD_CANCEL: return FT_CANCEL; ! case SD_SKIP: return FT_SKIP; ! case SD_NOSPACE: return FT_NOSPACE; ! ! default: ! panel_3s_message("%s: Copy failed, %s.", ! from, copyerr[error - 1], ! (char *)NULL, ! IL_MOVE | IL_BEEP | IL_ERROR); ! return FT_COPY; ! } return FT_OK; *************** *** 2664,2668 **** if (same_file(this->path, dir)) { ! panel_1s_message(nice_try, NULL, IL_FREEZED | IL_BEEP | IL_ERROR); return; } --- 2667,2672 ---- if (same_file(this->path, dir)) { ! panel_1s_message(nice_try, (char *)NULL, ! IL_FREEZED | IL_BEEP | IL_ERROR); return; } *************** *** 2756,2759 **** --- 2760,2764 ---- return; + /* Remember the index of the first selected file. */ for (i = 0; i < this->entries; i++) if (this->dir_entry[i].selected) *************** *** 2804,2808 **** { command = xmalloc(32 + strlen(name) + 1); ! sprintf(command, "rm -r -f %s", name); result = (start(command, 1) == 0); xfree(command); --- 2809,2813 ---- { command = xmalloc(32 + strlen(name) + 1); ! sprintf(command, "rm -r -f \"%s\"", name); result = (start(command, 1) == 0); xfree(command); *************** *** 3010,3014 **** if (same_file(this->path, dir)) { ! panel_1s_message(nice_try, NULL, IL_FREEZED | IL_BEEP | IL_ERROR); return; } --- 3015,3020 ---- if (same_file(this->path, dir)) { ! panel_1s_message(nice_try, (char *)NULL, ! IL_FREEZED | IL_BEEP | IL_ERROR); return; } *************** *** 3018,3021 **** --- 3024,3028 ---- dir[len ] = '\0'; + /* Remember the index of the first selected file. */ for (i = 0; i < this->entries; i++) if (this->dir_entry[i].selected) *************** *** 3327,3331 **** } ! if (this->dir_entry[this_entry].type == FILE_ENTRY && other->dir_entry[other_entry].type == FILE_ENTRY) { --- 3334,3338 ---- } ! if (this->dir_entry[this_entry].type == FILE_ENTRY && other->dir_entry[other_entry].type == FILE_ENTRY) { *************** *** 3334,3338 **** { /* Ask for permission to continue if the files have ! different size. */ if (panel_1s_message("Files have different size. Continue? ", "yn", IL_BEEP | IL_ERROR) != 'y') --- 3341,3345 ---- { /* Ask for permission to continue if the files have ! different size. */ if (panel_1s_message("Files have different size. Continue? ", "yn", IL_BEEP | IL_ERROR) != 'y') *************** *** 3345,3349 **** other, other_entry); ! switch (result) { case CF_ABORT: --- 3352,3356 ---- other, other_entry); ! switch ((int)result) { case CF_ABORT: *************** *** 3390,3397 **** { /* The files differ. Report the offset of the ! first difference encountered. */ char *msg = xmalloc(128); ! sprintf(msg, "%d (0x%x)", result, result); panel_2s_message("Files differ at offset %s. ", msg, (char *)NULL, IL_BEEP | IL_SAVE); --- 3397,3404 ---- { /* The files differ. Report the offset of the ! first difference encountered. */ char *msg = xmalloc(128); ! sprintf(msg, "%ld (0x%lx)", (long)result,(long)result); panel_2s_message("Files differ at offset %s. ", msg, (char *)NULL, IL_BEEP | IL_SAVE); *************** *** 3409,3413 **** IL_MOVE | IL_BEEP | IL_SAVE | IL_ERROR); /* At least one of the files is not a regular file, thus we ! will not go any further. */ } --- 3416,3420 ---- IL_MOVE | IL_BEEP | IL_SAVE | IL_ERROR); /* At least one of the files is not a regular file, thus we ! will not go any further. */ } *************** *** 3442,3446 **** panel_update(this); panel_update(other); ! return; } --- 3449,3453 ---- panel_update(this); panel_update(other); ! return; } *************** *** 3568,3573 **** /* The destination name (new_name) exists. Ask permission ! to overwrite. */ ! if (this->chkdest == ON) error = panel_warning(this, new_name); --- 3575,3580 ---- /* The destination name (new_name) exists. Ask permission ! to overwrite. */ ! if (this->chkdest == ON) error = panel_warning(this, new_name); *************** *** 3579,3583 **** command = xmalloc(32 + strlen(new_name) + 1); ! sprintf(command, "rm -r -f %s", new_name); result = (start(command, 1) == 0); xfree(command); --- 3586,3590 ---- command = xmalloc(32 + strlen(new_name) + 1); ! sprintf(command, "rm -r -f \"%s\"", new_name); result = (start(command, 1) == 0); xfree(command); *************** *** 3685,3688 **** --- 3692,3942 ---- + /* + * Only regular files are considered. The other files are ignored. + */ + + static int + pack_compare_fn(first, second) + const void *first; + const void *second; + { + return (*(const dir_entry_t * const *)second)->size - + (*(const dir_entry_t * const *)first)->size; + } + + + /* + * Select the files that would go into the first bin according to the + * "First Fit Decreasing" aproximation for the bin packing algorithm. + * This algorithm is just a poor aproximation, first because the + * problem of finding an optimal solution for bin-packing is + * NP-complete (with ((11 / 9) * OPTIMAL + 4) being the best known + * aproximation guarantee, and second because we don't actually know + * how big a file system block actually is. Therefore we don't know + * if we should round up file sizes to 512 bytes, 1Kb, 2Kb, 4Kb, etc. + * We will assume 1Kb, but it might not necessary be true... + */ + + void + panel_act_BIN_PACKING(this, other, bin_size) + panel_t *this; + panel_t *other; + off_t bin_size; + { + char msg[160]; + off_t file_size; + long free_blocks; + off_t *bins = NULL; + dir_entry_t **buffer; + char *fn = "BIN PACKING"; + int max_bins = 0, used_bins = 0; + int entry, candidates = 0, big_files = 0; + + if (bin_size == 0) + { + struct fs_usage fsu; + + fsu.fsu_blocks = -1; + + if (get_fs_usage(other->path, &fsu) >= 0 && fsu.fsu_blocks != -1) + { + /* Make bin_size equal the file system free space in the + other panel. */ + free_blocks = ((geteuid() == 0) ? fsu.fsu_bfree : fsu.fsu_bavail); + bin_size = (free_blocks * 512) / 1024; + } + } + + /* First unselect all the files in the current panel. */ + panel_unselect_all(this); + + /* Create a vector of dir_entry_t pointers and fill it with + pointers to the directory entries that are regular files. + Note that we skip the regular files whose size is bigger + than the bin size. */ + buffer = (dir_entry_t **)xmalloc(this->entries * sizeof(dir_entry_t *)); + + for (entry = 0; entry < this->entries; entry++) + if (S_ISREG(this->dir_entry[entry].mode)) + { + file_size = this->dir_entry[entry].size; + + if (file_size % 1024) + file_size += 1024 - file_size % 1024; + + file_size /= 1024; + + if (file_size <= bin_size) + buffer[candidates++] = &this->dir_entry[entry]; + else + big_files++; + } + + /* Then sort the pointers in decreasing order, based on the sizes + of the corresponding directory entries. */ + qsort(buffer, candidates, sizeof(dir_entry_t *), pack_compare_fn); + + /* Now start filling the bins. Assume an infinite number of bins. */ + for (entry = 0; entry < candidates; entry++) + { + int current_bin; + file_size = buffer[entry]->size; + + if (file_size % 1024) + file_size += 1024 - file_size % 1024; + + file_size /= 1024; + + /* Look for a suitable bin. */ + for (current_bin = 0; current_bin < used_bins; current_bin++) + { + if (bins[current_bin] >= file_size) + { + bins[current_bin] -= file_size; + + /* Select the file if it goes into the first bin. */ + if (current_bin == 0) + { + buffer[entry]->selected = 1; + this->selected_entries++; + } + + break; + } + } + + if (current_bin == used_bins) + { + /* The file doesn't fit into any of the bins. We have to + create a new bin. Put the file into the newly created + bin. */ + if (used_bins == max_bins) + { + max_bins += 16; + bins = (off_t *)xrealloc(bins, max_bins * sizeof(off_t)); + } + + bins[used_bins++] = bin_size - file_size; + + if (current_bin == 0) + { + buffer[entry]->selected = 1; + this->selected_entries++; + } + } + } + + panel_update(this); + + if (bins) + xfree(bins); + + xfree(buffer); + + if (candidates > 0) + { + if (big_files > 0) + { + sprintf(msg, + "%s %d file(s): %s %d bin(s). %d file(s) are too big.", + fn, candidates, "You need approximately", + used_bins, big_files); + } + else + sprintf(msg, + "%s %d file(s): You need approximately %d bin(s).", + fn, candidates, used_bins); + } + else + { + if (big_files > 0) + sprintf(msg, "%s: No suitable files found (smaller than %ldKb).", + fn, (long)bin_size); + else + sprintf(msg, "%s: No regular files found.", fn); + } + + panel_1s_message(msg, (char *)NULL, + IL_FREEZED | IL_BEEP | IL_SAVE | IL_MOVE | IL_HOME); + } + + + /* + * Create a vector of pointers to strings, one string for each pattern + * in `string'. The patterns in string are separated by spaces. + * Spaces can be inserted into patterns by quoting them with a \. The + * \ itself can be used if inserted twice. + */ + + char ** + panel_parse_patterns(string) + char *string; + { + char c; + int i = 0; + int index = 0; + int escaping = 0; + char *pattern = xmalloc(strlen(string) + 1); + char **patterns = (char **)xcalloc(2, sizeof(char *)); + + while (1) + switch ((c = *string++)) + { + case '\0': + case ' ': + case '\t': if (escaping && c != '\0') + pattern[i++] = c; + else + { + if (i > 0) + { + /* The pattern is not empty. Add it to + the list. */ + pattern[i++] = '\0'; + patterns[index++] = xstrdup(pattern); + patterns[index] = NULL; + } + + if (c == '\0') + goto done; + + patterns = (char **)xrealloc(patterns, + (index + 2) * + sizeof(char *)); + i = 0; + } + break; + + case '\\': if (escaping) + pattern[i++] = c; + escaping = !escaping; + break; + + default: if (escaping) + pattern[i++] = '\\'; + pattern[i++] = c; + escaping = 0; + break; + } + + done: + xfree(pattern); + return patterns; + } + + + void + panel_deallocate_patterns(patterns) + char **patterns; + { + char **safe_patterns = patterns; + + while (*patterns) + xfree(*patterns++); + + xfree(safe_patterns); + } + + int panel_action(this, action, other, aux_info, repeat_count) *************** *** 3695,3699 **** size_t len; isearch_aux_t *iai; ! int i, done = 0, result; int need_update, need_update_all, old_current_entry; --- 3949,3954 ---- size_t len; isearch_aux_t *iai; ! int entry, done = 0, result; ! char **patterns, **safe_patterns; int need_update, need_update_all, old_current_entry; *************** *** 3744,3753 **** this->selected_entries = 0; ! for (i = 0; i < this->entries; i++) { ! if (this->dir_entry[i].type != DIR_ENTRY) { ! this->dir_entry[i].selected = !this->dir_entry[i].selected; ! this->selected_entries += this->dir_entry[i].selected; } } --- 3999,4009 ---- this->selected_entries = 0; ! for (entry = 0; entry < this->entries; entry++) { ! if (this->dir_entry[entry].type != DIR_ENTRY) { ! this->dir_entry[entry].selected = ! !this->dir_entry[entry].selected; ! this->selected_entries += this->dir_entry[entry].selected; } } *************** *** 3976,3983 **** if (this->path[1] == '\0') qsort(this->dir_entry, this->entries, ! sizeof(dir_entry_t), qcompare); else qsort(this->dir_entry + 1, this->entries - 1, ! sizeof(dir_entry_t), qcompare); panel_update_entries(this); --- 4232,4239 ---- if (this->path[1] == '\0') qsort(this->dir_entry, this->entries, ! sizeof(dir_entry_t), sort_compare_fn); else qsort(this->dir_entry + 1, this->entries - 1, ! sizeof(dir_entry_t), sort_compare_fn); panel_update_entries(this); *************** *** 4001,4037 **** case act_PATTERN_SELECT: case act_PATTERN_UNSELECT: ! for (i = 0; i < this->entries; i++) ! if (this->dir_entry[i].type != DIR_ENTRY) ! { ! int fnm_flags = FNM_PATHNAME; ! if (LeadingDotMatch == OFF) ! fnm_flags |= FNM_PERIOD; ! ! if (fnmatch((char *)aux_info, ! this->dir_entry[i].name, fnm_flags) == 0) { ! switch (action) ! { ! case act_PATTERN_SELECT: ! if (!this->dir_entry[i].selected) { ! this->dir_entry[i].selected = 1; this->selected_entries++; } ! break; ! ! case act_PATTERN_UNSELECT: ! ! if (this->dir_entry[i].selected) { ! this->dir_entry[i].selected = 0; this->selected_entries--; } ! break; } } ! } panel_update_entries(this); --- 4257,4296 ---- case act_PATTERN_SELECT: case act_PATTERN_UNSELECT: ! /* Create a list with all the shell patterns. */ ! safe_patterns = panel_parse_patterns((char *)aux_info); ! for (patterns = safe_patterns; *patterns; patterns++) ! for (entry = 0; entry < this->entries; entry++) ! if (this->dir_entry[entry].type != DIR_ENTRY) { ! int fnm_flags = FNM_PATHNAME; ! ! if (LeadingDotMatch == OFF) ! fnm_flags |= FNM_PERIOD; ! if (fnmatch(*patterns, this->dir_entry[entry].name, ! fnm_flags) == 0) ! { ! if (action == act_PATTERN_SELECT) ! { ! if (!this->dir_entry[entry].selected) { ! this->dir_entry[entry].selected = 1; this->selected_entries++; } ! } ! else ! { ! if (this->dir_entry[entry].selected) { ! this->dir_entry[entry].selected = 0; this->selected_entries--; } ! } } } ! ! /* Deallocate the list of shell patterns. */ ! panel_deallocate_patterns(safe_patterns); panel_update_entries(this); *************** *** 4225,4228 **** --- 4484,4491 ---- case act_COMPARE: panel_act_COMPARE(this, other); + break; + + case act_BIN_PACKING: + panel_act_BIN_PACKING(this, other, (off_t)atoi((char *)aux_info)); break; diff -rc2P git-4.3.14/src/panel.h /home/tudor/src/git/git-4.3.15/src/panel.h *** git-4.3.14/src/panel.h Tue Dec 3 14:51:43 1996 --- /home/tudor/src/git/git-4.3.15/src/panel.h Fri Dec 20 17:44:41 1996 *************** *** 116,119 **** --- 116,121 ---- #define act_COMPARE 46 + #define act_BIN_PACKING 47 + /* File sort methods. */ diff -rc2P git-4.3.14/src/prefix.sh /home/tudor/src/git/git-4.3.15/src/prefix.sh *** git-4.3.14/src/prefix.sh Wed Dec 4 14:27:33 1996 --- /home/tudor/src/git/git-4.3.15/src/prefix.sh Sat Dec 21 18:56:48 1996 *************** *** 1,3 **** ! #!/bin/sh ### --- 1,3 ---- ! #! /bin/sh ### diff -rc2P git-4.3.14/src/signals.c /home/tudor/src/git/git-4.3.15/src/signals.c *** git-4.3.14/src/signals.c Mon Apr 22 04:55:11 1996 --- /home/tudor/src/git/git-4.3.15/src/signals.c Mon Dec 23 19:41:47 1996 *************** *** 107,113 **** { signals_status = status; ! signal(SIGTERM, status == ON ? fatal_signal : SIG_IGN); ! signal(SIGQUIT, status == ON ? fatal_signal : SIG_IGN); ! signal(SIGINT , status == ON ? user_panic : SIG_IGN); } --- 107,126 ---- { signals_status = status; ! ! ! /* Don't use conditional expressions here, the Alpha OSF 4.0 C ! compiler will complain. */ ! if (status == ON) ! { ! signal(SIGTERM, fatal_signal); ! signal(SIGQUIT, fatal_signal); ! signal(SIGINT , user_panic); ! } ! else ! { ! signal(SIGTERM, SIG_IGN); ! signal(SIGQUIT, SIG_IGN); ! signal(SIGINT , SIG_IGN); ! } } diff -rc2P git-4.3.14/term/.gitrc.aixterm /home/tudor/src/git/git-4.3.15/term/.gitrc.aixterm *** git-4.3.14/term/.gitrc.aixterm Wed Nov 20 14:30:54 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.aixterm Fri Dec 20 15:48:03 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.ansi /home/tudor/src/git/git-4.3.15/term/.gitrc.ansi *** git-4.3.14/term/.gitrc.ansi Wed Nov 20 14:31:00 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.ansi Fri Dec 20 15:48:16 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.common /home/tudor/src/git/git-4.3.15/term/.gitrc.common *** git-4.3.14/term/.gitrc.common Tue Dec 3 20:35:26 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.common Mon Dec 23 20:14:40 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### *************** *** 389,419 **** ^CD = delete ^CbD = B-DELETE; %?{Delete selected entries? } rm -r -f %i&;;;;y ! ^CZ = UNCOMPRESS; $GIT_COMPRESS -d %i;;;;y ! ^CbfZ = BF-UNCOMPRESS; $GIT_COMPRESS -df %i&;;;;y ! ^CfZ = F-UNCOMPRESS; $GIT_COMPRESS -df %i;;;;y ! ^CbZ = B-UNCOMPRESS; $GIT_COMPRESS -d %i&;;;;y ! ^Cbz = B-COMPRESS; $GIT_COMPRESS %i&;;;;y ^Cnd = name-downcase ^Cnu = name-upcase ! ^Cz = COMPRESS; $GIT_COMPRESS %i;;;;y ^CE = UUDECODE; uudecode %f;;;;y ^CbE = B-UUDECODE; uudecode %f&;;;;y ^Cbe = B-UUENCODE; uuencode %f %f > %f.uu&;;;;y ^Ce = UUENCODE; uuencode %f %f > %f.uu;;;;y ! ^CI = RPM-INSTALL; rpm -i %f;;;;y ! ^CbI = B-RPM-INSTALL; rpm -i %f&;;;;y ! ^Ci = RPM-UNINSTALL; rpm -e `echo %f | sed 's/.i386.rpm//g' | sed 's/.src.rpm//g'`;;;;y ! ^Cbi = B-RPM-UNINSTALL; rpm -e `echo %f | sed 's/.i386.rpm//g' | sed 's/.src.rpm//g'`&;;;;y ^Cq = RPM-QUERY; rpm %s{,-qil } | $GIT_PAGER;;;y ! ^CN = RPM-UPGRADE; rpm -U %f;;;;y ! ^CbN = B-RPM-UPGRADE; rpm -U %f&;;;;y ^CA = UNTAR; tar -xf %f;;;;y ^Ca = TAR; tar -cf %b.tar %i;;;;y ^CbA = B-UNTAR; tar -xf %f&;;;;y ^Cba = B-TAR; tar -cf %b.tar %i&;;;;y ! ^CX = UNCOMPRESS-UNTAR; $GIT_COMPRESS -d -c %f | tar -xf -;;;;y ! ^CbX = B-UNCOMPRESS-UNTAR; $GIT_COMPRESS -d -c %f | tar -xf -&;;;;y ! ^Cbx = B-TAR-COMPRESS; tar -cf - %d | $GIT_COMPRESS -c > %d.tar.gz&;;;;y ! ^Cx = TAR-COMPRESS; tar -cf - %d | $GIT_COMPRESS -c > %d.tar.gz;;;;y ^CC = copy ^CbC = B-COPY; cp -r -f %i %s{Copying %i to: ,%P/}&;;;;y --- 389,423 ---- ^CD = delete ^CbD = B-DELETE; %?{Delete selected entries? } rm -r -f %i&;;;;y ! ^CZ = UNCOMPRESS; gzip -rd -- %i;;;;y ! ^CbfZ = BF-UNCOMPRESS; gzip -rdf -- %i&;;;;y ! ^CfZ = F-UNCOMPRESS; gzip -rdf -- %i;;;;y ! ^CbZ = B-UNCOMPRESS; gzip -rd -- %i&;;;;y ! ^Cbz = B-COMPRESS; gzip -r9 -- %i&;;;;y ^Cnd = name-downcase ^Cnu = name-upcase ! ^Cz = COMPRESS; gzip -r9 -- %i;;;;y ^CE = UUDECODE; uudecode %f;;;;y ^CbE = B-UUDECODE; uudecode %f&;;;;y ^Cbe = B-UUENCODE; uuencode %f %f > %f.uu&;;;;y ^Ce = UUENCODE; uuencode %f %f > %f.uu;;;;y ! ^Ck = MIME-PACK; mpack -s %s{Subject (required): ,[%f]} -o %f.mime %f;;;;y ! ^Cbk = B-MIME-PACK; mpack -s %s{Subject (required): ,[%f]} -o %f.mime %f&;;;;y ! ^CbK = B-MIME-UNPACK; munpack %f&;;;;y ! ^CK = MIME-UNPACK; munpack %f;;;;y ! ^CI = RPM-INSTALL; rpm -i -- %f;;;;y ! ^CbI = B-RPM-INSTALL; rpm -i -- %f&;;;;y ! ^Ci = RPM-UNINSTALL; rpm -e -- `echo %f | sed 's/.i386.rpm//g' | sed 's/.src.rpm//g'`;;;;y ! ^Cbi = B-RPM-UNINSTALL; rpm -e -- `echo %f | sed 's/.i386.rpm//g' | sed 's/.src.rpm//g'`&;;;;y ^Cq = RPM-QUERY; rpm %s{,-qil } | $GIT_PAGER;;;y ! ^CN = RPM-UPGRADE; rpm -U -- %f;;;;y ! ^CbN = B-RPM-UPGRADE; rpm -U -- %f&;;;;y ^CA = UNTAR; tar -xf %f;;;;y ^Ca = TAR; tar -cf %b.tar %i;;;;y ^CbA = B-UNTAR; tar -xf %f&;;;;y ^Cba = B-TAR; tar -cf %b.tar %i&;;;;y ! ^CX = UNCOMPRESS-UNTAR; gzip -dc -- %f | tar -xf -;;;;y ! ^CbX = B-UNCOMPRESS-UNTAR; gzip -dc -- %f | tar -xf -&;;;;y ! ^Cbx = B-TAR-COMPRESS; tar -cf - %d | gzip -9c > %d.tar.gz&;;;;y ! ^Cx = TAR-COMPRESS; tar -cf - %d | gzip -9c > %d.tar.gz;;;;y ^CC = copy ^CbC = B-COPY; cp -r -f %i %s{Copying %i to: ,%P/}&;;;;y *************** *** 428,435 **** ^Cmd = MTOOLS-CHDIR; mcd %s{New directory: ,a:};;;;y ^Cm^D = MTOOLS-CHDIR; mcd %s{New directory: ,a:};;;;y ! ^CmP = MTOOLS-PUT; mcopy %i %s{Destination: ,a:};;;;y ! ^CbmP = B-MTOOLS-PUT; mcopy %i %s{Destination: ,a:}&;;;;y ! ^CmG = MTOOLS-GET; mcopy %s{Source files: ,a:} %s{Destination: ,.};;;;y ! ^CbmG = B-MTOOLS-GET; mcopy %s{Source files: ,a:} %s{Destination: ,.}&;;;;y ^CmD = MTOOLS-DELETE; mdel %s{Files: ,a:};;;;y ^CbmD = B-MTOOLS-DELETE; mdel %s{Files: ,a:}&;;;;y --- 432,439 ---- ^Cmd = MTOOLS-CHDIR; mcd %s{New directory: ,a:};;;;y ^Cm^D = MTOOLS-CHDIR; mcd %s{New directory: ,a:};;;;y ! ^CmP = MTOOLS-PUT; mcopy -- %i %s{Destination: ,a:};;;;y ! ^CbmP = B-MTOOLS-PUT; mcopy -- %i %s{Destination: ,a:}&;;;;y ! ^CmG = MTOOLS-GET; mcopy -- %s{Source files: ,a:} %s{Destination: ,.};;;;y ! ^CbmG = B-MTOOLS-GET; mcopy -- %s{Source files: ,a:} %s{Destination: ,.}&;;;;y ^CmD = MTOOLS-DELETE; mdel %s{Files: ,a:};;;;y ^CbmD = B-MTOOLS-DELETE; mdel %s{Files: ,a:}&;;;;y *************** *** 437,447 **** ^CmF = MTOOLS-FORMAT; mformat %s{Floppy: ,a:} %?{Are you sure? };;;;y ^CbmF = B-MTOOLS-FORMAT; mformat %s{Floppy: ,a:} %?{Are you sure? }&;;;;y ! ^CmM = MTOOLS-MKDIR; mmd %s{Directory: ,a:};;;;y ! ^CbmM = B-MTOOLS-MKDIR; mmd %s{Directory: ,a:}&;;;;y ^CmK = MTOOLS-RMDIR; mdeltree %s{Directory: ,a:} %?{Are you sure? };;;;y ^CbmK = B-MTOOLS-RMDIR; mdeltree %s{Directory: ,a:} %?{Are you sure? }&;;;;y ! ^CmR = MTOOLS-RENAME; mmove %s{Source files: ,a:} %s{Destination: ,a:};;;;y ! ^CbmR = B-MTOOLS-RENAME; mmove %s{Source files: ,a:} %s{Destination: ,a:}&;;;;y ! ^CmT = MTOOLS-TYPE; mtype %s{File: ,a:} | $GIT_PAGER;;;y ^CM = CHMOD; chmod %s{New mode of %i: ,%m} %i;;;;y ^CbM = B-CHMOD; chmod %s{New mode of %i: ,%m} %i&;;;;y --- 441,451 ---- ^CmF = MTOOLS-FORMAT; mformat %s{Floppy: ,a:} %?{Are you sure? };;;;y ^CbmF = B-MTOOLS-FORMAT; mformat %s{Floppy: ,a:} %?{Are you sure? }&;;;;y ! ^CmM = MTOOLS-MKDIR; mmd -- %s{Directory: ,a:};;;;y ! ^CbmM = B-MTOOLS-MKDIR; mmd -- %s{Directory: ,a:}&;;;;y ^CmK = MTOOLS-RMDIR; mdeltree %s{Directory: ,a:} %?{Are you sure? };;;;y ^CbmK = B-MTOOLS-RMDIR; mdeltree %s{Directory: ,a:} %?{Are you sure? }&;;;;y ! ^CmR = MTOOLS-RENAME; mmove -- %s{Source files: ,a:} %s{Destination: ,a:};;;;y ! ^CbmR = B-MTOOLS-RENAME; mmove -- %s{Source files: ,a:} %s{Destination: ,a:}&;;;;y ! ^CmT = MTOOLS-TYPE; mtype -- %s{File: ,a:} | $GIT_PAGER;;;y ^CM = CHMOD; chmod %s{New mode of %i: ,%m} %i;;;;y ^CbM = B-CHMOD; chmod %s{New mode of %i: ,%m} %i&;;;;y *************** *** 456,459 **** --- 460,464 ---- ^CbrG = B-R-CHGRP; chgrp -R %s{New group of %i: ,} %i&;;;;y ^CrG = R-CHGRP; chgrp -R %s{New group of %i: ,} %i;;;;y + ^Cfd = FAST-DIFF; diff -r -q %a %P/%A | $GIT_PAGER;;;y ^C= = DIFF; diff -r -u %a %P/%A | $GIT_PAGER;;;y ^C^[= = LAST-BACKUP-DIFF; diff -u %f %f~ | $GIT_PAGER;;;y *************** *** 465,474 **** ^C2a = ASCII-MAIL; cat %i | mail %s{To: ,};;;;y ^Cb2a = B-ASCII-MAIL; cat %i | mail %s{To: ,}&;;;;y ! ^C2b = BINARY-MAIL; uuencode %f %f | mail %s{To: ,};;;;y ^Cb2b = B-BINARY-MAIL; uuencode %f %f | mail %s{To: ,}&;;;;y ! ^CP = DECRYPT; pgp %f;;;y ! ^Cp = ENCRYPT; pgp -esa %f;;;y ! ^CU = DIRECTORY-USAGE; gitredir du -s %d;;;;y ^CW = WIPE; %?{Wiping selected files? } gitwipe %i;;;;y ^X0 = enlarge-other-panel ^X1 = enlarge-panel --- 470,482 ---- ^C2a = ASCII-MAIL; cat %i | mail %s{To: ,};;;;y ^Cb2a = B-ASCII-MAIL; cat %i | mail %s{To: ,}&;;;;y ! ^C2b = BINARY-MAIL; uuencode %f %f | mail %s{To: ,};;;;y ^Cb2b = B-BINARY-MAIL; uuencode %f %f | mail %s{To: ,}&;;;;y ! ^C2m = MIME-MAIL; mpack -s %s{Subject (required): ,[%f]} %f %s{To: ,};;;;y ! ^Cb2m = B-MIME-MAIL; mpack -s %s{Subject (required): ,[%f]} %f %s{To: ,}&;;;;y ! ^CP = DECRYPT; pgp -- %f;;;y ! ^Cp = ENCRYPT; pgp -esa -- %f;;;y ! ^CU = DIRECTORY-USAGE; (du -s %d 1>&2 && exit 1);;;;y ^CW = WIPE; %?{Wiping selected files? } gitwipe %i;;;;y + ^C~ = bin-packing ^X0 = enlarge-other-panel ^X1 = enlarge-panel *************** *** 508,516 **** ^Xs = isearch-forward ^Xt = switch-panels ! ^XT = DATE; gitredir date;;;;y ^Xv = MULTIPLE-VIEW; $GIT_PAGER %i;;;y ! ^Xw = WHEREIS; gitredir whereis %s{Program name: ,};;;;y ^Xz = SUB-SHELL; $GIT_SHELL ! ^XW = WHICH; gitredir which %s{Program name: ,};;;;y ^X4a = CHANGE-LOG; $GIT_EDITOR ChangeLog;;n ^[xrm = READ-MAIL; $GIT_RMAIL;;n --- 516,524 ---- ^Xs = isearch-forward ^Xt = switch-panels ! ^XT = DATE; (date 1>&2 && exit 1);;;;y ^Xv = MULTIPLE-VIEW; $GIT_PAGER %i;;;y ! ^Xw = WHEREIS; (whereis %s{Program name: ,} 1>&2 && exit 1);;;;y ^Xz = SUB-SHELL; $GIT_SHELL ! ^XW = WHICH; (which %s{Program name: ,} 1>&2 && exit 1);;;;y ^X4a = CHANGE-LOG; $GIT_EDITOR ChangeLog;;n ^[xrm = READ-MAIL; $GIT_RMAIL;;n *************** *** 527,531 **** ^[% = FIND; find . -name '%s{File pattern: ,}' -print | $GIT_PAGER;;;y ^[$ = FIND-ACTION; find . -name '%s{File pattern: ,}' %s{Action: ,-exec } | $GIT_PAGER;;;y ! ^[& = LOCATE; locate '%s{File pattern: ,}' | $GIT_PAGER;;;y ^[ac = adapt-current-directory ^[ao = adapt-other-directory --- 535,539 ---- ^[% = FIND; find . -name '%s{File pattern: ,}' -print | $GIT_PAGER;;;y ^[$ = FIND-ACTION; find . -name '%s{File pattern: ,}' %s{Action: ,-exec } | $GIT_PAGER;;;y ! ^[& = LOCATE; locate -- '%s{File pattern: ,}' | $GIT_PAGER;;;y ^[ac = adapt-current-directory ^[ao = adapt-other-directory *************** *** 574,583 **** ^[soi = panel-sort-by-owner-id ^[son = panel-sort-by-owner-name ! ^[Sf = FINGER; finger %s{Server name: ,@} | $GIT_PAGER;;;y ! ^[Sm = MOUNTED-FILE-SYSTEMS; gitredir mount;;;;y ^[Sq = QUOTA; quota -v;;;y ! ^[Ss = DISK-FREE-SPACE; gitredir df;;;;y ! ^[Su = USERS; gitredir users;;;;y ! ^[Sv = VIRTUAL-MEMORY-STATUS; gitredir $GIT_VMSTAT;;;;y ^[Sw = WHO; w | $GIT_PAGER;;;y ^[PA = PS; ps -a | $GIT_PAGER;;;y --- 582,591 ---- ^[soi = panel-sort-by-owner-id ^[son = panel-sort-by-owner-name ! ^[Sf = FINGER; finger 00 %s{Server name: ,@} | $GIT_PAGER;;;y ! ^[Sm = MOUNTED-FILE-SYSTEMS; (mount 1>&2 && exit 1);;;;y ^[Sq = QUOTA; quota -v;;;y ! ^[Ss = DISK-FREE-SPACE; (df 1>&2 && exit 1);;;;y ! ^[Su = USERS; (users 1>&2 && exit 1);;;;y ! ^[Sv = VIRTUAL-MEMORY-STATUS; ($GIT_VMSTAT 1>&2 && exit 1);;;;y ^[Sw = WHO; w | $GIT_PAGER;;;y ^[PA = PS; ps -a | $GIT_PAGER;;;y diff -rc2P git-4.3.14/term/.gitrc.generic /home/tudor/src/git/git-4.3.15/term/.gitrc.generic *** git-4.3.14/term/.gitrc.generic Wed Nov 20 14:31:09 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.generic Fri Dec 20 15:48:51 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.hft /home/tudor/src/git/git-4.3.15/term/.gitrc.hft *** git-4.3.14/term/.gitrc.hft Wed Nov 20 14:31:13 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.hft Fri Dec 20 15:48:57 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.hpterm /home/tudor/src/git/git-4.3.15/term/.gitrc.hpterm *** git-4.3.14/term/.gitrc.hpterm Wed Nov 20 14:31:21 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.hpterm Mon Dec 23 16:42:58 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.linux /home/tudor/src/git/git-4.3.15/term/.gitrc.linux *** git-4.3.14/term/.gitrc.linux Wed Nov 20 14:31:29 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.linux Fri Dec 20 15:49:07 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.mach /home/tudor/src/git/git-4.3.15/term/.gitrc.mach *** git-4.3.14/term/.gitrc.mach Wed Nov 20 14:31:33 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.mach Fri Dec 20 15:49:12 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.minix /home/tudor/src/git/git-4.3.15/term/.gitrc.minix *** git-4.3.14/term/.gitrc.minix Wed Nov 20 14:31:36 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.minix Fri Dec 20 15:49:20 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.thix /home/tudor/src/git/git-4.3.15/term/.gitrc.thix *** git-4.3.14/term/.gitrc.thix Wed Nov 20 14:31:40 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.thix Fri Dec 20 15:49:25 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.vt100 /home/tudor/src/git/git-4.3.15/term/.gitrc.vt100 *** git-4.3.14/term/.gitrc.vt100 Wed Nov 20 14:31:43 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.vt100 Mon Dec 23 16:43:20 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### *************** *** 208,212 **** ^[[[B = FILE-ACTION; gitaction %p %f # F2 (telnet from a Linux console) ^[[[C = VIEW; gitview %f;;n # F3 (telnet from a Linux console) ! ^[[[D = EDIT; $GIT_EDITOR %f;;n # F4 (telnet from a Linux console) ^[[[E = copy # F5 (telnet from a Linux console) ^[OP = INFO; info %s{Info documentation: ,} # F1 --- 208,212 ---- ^[[[B = FILE-ACTION; gitaction %p %f # F2 (telnet from a Linux console) ^[[[C = VIEW; gitview %f;;n # F3 (telnet from a Linux console) ! ^[[[D = EDIT; $GIT_EDITOR %f;;n # F4 (telnet from a Linux console) ^[[[E = copy # F5 (telnet from a Linux console) ^[OP = INFO; info %s{Info documentation: ,} # F1 diff -rc2P git-4.3.14/term/.gitrc.vt102 /home/tudor/src/git/git-4.3.15/term/.gitrc.vt102 *** git-4.3.14/term/.gitrc.vt102 Wed Nov 20 14:31:46 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.vt102 Mon Dec 23 16:43:29 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.xterm /home/tudor/src/git/git-4.3.15/term/.gitrc.xterm *** git-4.3.14/term/.gitrc.xterm Wed Nov 20 14:31:50 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.xterm Mon Dec 23 16:43:39 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/.gitrc.xterm-color /home/tudor/src/git/git-4.3.15/term/.gitrc.xterm-color *** git-4.3.14/term/.gitrc.xterm-color Wed Nov 20 14:31:55 1996 --- /home/tudor/src/git/git-4.3.15/term/.gitrc.xterm-color Mon Dec 23 16:43:48 1996 *************** *** 2,6 **** ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.14 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### --- 2,6 ---- ############################################################################### ### ### ! ### GNU Interactive Tools 4.3.15 configuration file ### ### Copyright (c) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ### ### ### diff -rc2P git-4.3.14/term/ChangeLog /home/tudor/src/git/git-4.3.15/term/ChangeLog *** git-4.3.14/term/ChangeLog Fri Nov 29 18:11:14 1996 --- /home/tudor/src/git/git-4.3.15/term/ChangeLog Mon Dec 23 16:46:41 1996 *************** *** 1,2 **** --- 1,13 ---- + Sat Dec 21 15:46:11 1996 Tudor Hulubei + + * .gitrc.common: Added -- to all the commands that support it. + Thanks to Andrei Caraman for reporting the problem. + + Fri Dec 20 15:49:52 1996 Tudor Hulubei + + * .gitrc.common: Replaced `gitrgrep command' with + `(command 1>&2 && exit 1)' in order to both get rid of gitredir + and to avoid some quoting problems. + Fri Nov 29 18:10:28 1996 Tudor Hulubei