configs  Check-in [2e8e994339]

Overview
Comment:Add cvsd to get a colored cvs diff
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 2e8e9943397da7565098604f5b0a6fffc58d98cf1e599ed5a5b75228149e7687
User & Date: js on 2020-08-30 03:44:27
Other Links: manifest | tags
Context
2020-08-30
11:26
Rename create_symlinks.sh to setup.sh check-in: 651581a411 user: js tags: trunk
03:44
Add cvsd to get a colored cvs diff check-in: 2e8e994339 user: js tags: trunk
03:41
fish: Set CVS_RSH to ssh check-in: 752b21cf9c user: js tags: trunk
Changes

Added fish/functions/cvsd.fish version [def85b4246].












1
2
3
4
5
6
7
8
9
10
11
+
+
+
+
+
+
+
+
+
+
+
function cvsd --wraps 'cvs diff'
    if type -q colordiff
        command cvs diff -uN $argv | colordiff | less -FRX
    else
        set -l red (tput setaf 1)
        set -l green (tput setaf 2)
        set -l reset (tput sgr0)
        cvs diff -uN $argv | sed "s/^+.*\$/$green&$reset/" |
            sed "s/^-.*\$/$red&$reset/" | less -FRX
    end
end

Modified fish/functions/fld.fish from [20c18b9bae] to [2fc5f175b6].

1
2

3
4
5
6
7
8
9
10
11
1

2
3
4
5
6
7
8
9
10
11

-
+









function fld --wraps 'fossil diff'
    if type -q colordiff2
    if type -q colordiff
        command fossil diff -N $argv | colordiff | less -FRX
    else
        set -l red (tput setaf 1)
        set -l green (tput setaf 2)
        set -l reset (tput sgr0)
        fossil diff -N $argv | sed "s/^+.*\$/$green&$reset/" |
            sed "s/^-.*\$/$red&$reset/" | less -FRX
    end
end

Modified zshrc from [327fda5d5a] to [790f05f245].

294
295
296
297
298
299
300














301
302
303
304
305
306
307
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321







+
+
+
+
+
+
+
+
+
+
+
+
+
+







			--export-marks $gitdir/fossil.marks	\
			$=importmarks_fossil |
		LC_ALL=C git fast-import			\
			--export-marks=$gitdir/git.marks	\
			$=importmarks_git
	}
fi

if which cvs &>/dev/null; then
	cvsd() {
		if which colordiff &>/dev/null; then
			cvs diff -uN "$@" | colordiff | less -FRX
		else
			red="$(tput setaf 1)"
			green="$(tput setaf 2)"
			reset="$(tput sgr0)"
			cvs diff -uN "$@" | sed "s/^+.*$/$green&$reset/" |
				sed "s/^-.*$/$red&$reset/" | less -FRX
		fi
	}
fi

# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
which url2pkg &>/dev/null && alias url2pkg="MAKEFLAGS= url2pkg"