plan9fox/sys/src/cmd/git/revert

#!/bin/rc
rfork en
. /sys/lib/git/common.rc

gitup

flagfmt='c:query query' args='file ...'
if (! eval `''{aux/getflags $*} || ~ $#* 0)
	exec aux/usage

commit=$gitfs/HEAD
if(~ $#query 1)
	commit=`{git/query -p $query}

files=`$nl{cleanname -d $gitrel $* | drop $gitroot}
for(f in `$nl{cd $commit/tree/ && walk -f ./$files}){
	mkdir -p `{basename -d $f}
	cp -x -- $commit/tree/$f $f
	touch $f
	git/add $f
}
exit ''
git: got git? Add a snapshot of git9 to 9front. 2021-05-17 01:49:45 +00:00			`#!/bin/rc`
git/revert: fork the namespace before running git/fs 2021-06-08 20:20:06 +00:00			`rfork en`
git: got git? Add a snapshot of git9 to 9front. 2021-05-17 01:49:45 +00:00			`. /sys/lib/git/common.rc`

			`gitup`

			`flagfmt='c:query query' args='file ...'`
git/revert: fix empty invocation git/revert requires a file name argument, but when none is given it fails in a strange way: % git/revert usage: cleanname [-d pwd] name... /bin/git/revert:15: null list in concatenation 2021-11-04 19:08:02 +00:00			if (! eval `''{aux/getflags $} \|\| ~ $# 0)
			`exec aux/usage`
git: got git? Add a snapshot of git9 to 9front. 2021-05-17 01:49:45 +00:00
git/fs: move mount point to $repo/.git/fs Moving the mount point to within the repo directory means that we can have multiple git repos mounted at once with no conflict. 2021-05-31 00:46:21 +00:00			`commit=$gitfs/HEAD`
git: got git? Add a snapshot of git9 to 9front. 2021-05-17 01:49:45 +00:00			`if(~ $#query 1)`
			commit=`{git/query -p $query}

git: better handling of absolute paths, regex metachars Git currently gets a bit confused if you try to manipulate files by absolute path. There were also a number of places where user-controlled file paths ended up getting passed to regex interpretation, which could confuse things. This change mainly does 2 things: - Adds a 'drop' function which drops a non-regex prefix from a string, and uses that to manipulate paths, simplifies 'subst', and removes 'subst -g', which was only used with fixed regexes; sed does this job fine. - When getting a path from a user, we make it absolute and then strip out the head Along the way it cleans up a couple of stupids: - 'for(f in $list) if(! ~ $#f 0) use $f: $f can't be a nil list because of list flattening. - removes a useless substitution here: all=`$nl{{git/query -c $1 $2; git/query -c $2 $3} \| sed 's/^..//' \| \ gsubst '^('$ourbr'\|'$basebr'\|'$theirbr')/*' \| sort \| uniq} where git/query -c doesn't produce paths prefixed with the query. 2021-08-17 04:31:15 +00:00			files=`$nl{cleanname -d $gitrel $* \| drop $gitroot}
			for(f in `$nl{cd $commit/tree/ && walk -f ./$files}){
git: got git? Add a snapshot of git9 to 9front. 2021-05-17 01:49:45 +00:00			mkdir -p `{basename -d $f}
git/revert: revert the old implementation was correct; we want to mark it dirty and let walk sort it out. 2021-06-29 20:03:26 +00:00			`cp -x -- $commit/tree/$f $f`
git/revert: update modification time on revert when reverting files, 'cp -x' updates the mtime to the time the file was committed. this prevents 'mk' from rebuilding the file, leading to stale builds. this change touches the file on revert, so that we rebuild the file. 2022-02-27 04:27:56 +00:00			`touch $f`
git/revert: revert the old implementation was correct; we want to mark it dirty and let walk sort it out. 2021-06-29 20:03:26 +00:00			`git/add $f`
git: got git? Add a snapshot of git9 to 9front. 2021-05-17 01:49:45 +00:00			`}`
			`exit ''`