From: ori@eigenstate.org
To: 9front@9front.org
Subject: Re: [9front] git: better handling of absolute paths, regex metachars
Date: Sat, 14 Aug 2021 15:24:14 -0400 [thread overview]
Message-ID: <182597C39FCD4D67B8227458971887E3@eigenstate.org> (raw)
In-Reply-To: <F8529A0B2B9DD13ECD7A682BE4A31A6F@wopr.sciops.net>
Quoth qwx <qwx@sciops.net>:
> git/push has a typo: `sub' instead of `subst' in the change.
> .git/fs may be removed from a remote git9 repo.
>
> Example:
>
> ; git/commit .
> heads/master: 72401e717205cf5864beebdcbacaefcd39ce8465
> ; git/push
> deltifying 5 objects: 100%
> writing 5 objects: 100%
> sub: './sub' directory entry not found
> sub: './sub' directory entry not found
> usage: basename [-d] string [suffix]
> /bin/git/push:41: > requires file
> ; rcpu -u qwx -h shithub.us
> cpu% cd /usr/git/qwx/qk1
> cpu% lc .git
> HEAD config description info/ objects/ refs/ webpublish # shithub page now broken
>
> Thanks,
>
> qwx
>
Had a couple of other issues too, like sometimes
leaving a '/' in $gitrel, making it '$gitwrongabs'
Here's another version:
--- //.git/fs/object/da085a2d4cca788686b8f68b2555040cf29dc16c/tree//sys/lib/git/common.rc
+++ /sys/lib/git/common.rc
@@ -11,23 +11,22 @@
exit 'usage'
}
-# subst [-g] this [that]
-fn subst{
- awk 'BEGIN{
- global = 0
- for(i = 1; ARGV[i] ~ /^-/; i++){
- if(ARGV[i] == "-g")
- global = 1
- ARGC--
- }
- this = ARGV[i++]; ARGC--
- that = ARGV[i++]; ARGC--
- }
+fn subst {
+ awk '
+ BEGIN{ARGC=0}
+ {sub(ARGV[1], ARGV[2]); print}
+ ' $*
+}
+
+fn drop {
+ awk '
+ BEGIN{ARGC=0}
{
- if(global) gsub(this, that)
- else sub(this, that)
+ if(index($0, ARGV[1]) == 1)
+ $0=substr($0, length(ARGV[1])+1)
print
- }' $*
+ }
+ ' $*
}
fn present {
@@ -77,7 +76,7 @@
if(~ $#gitroot 0)
die 'not a git repository'
gitfs=$gitroot/.git/fs
- gitrel=`{pwd | subst '^'$"gitroot'/?'}
+ gitrel=`{pwd | drop $gitroot | sed 's@^/@@'}
if(~ $#gitrel 0)
gitrel='.'
cd $gitroot
--- //.git/fs/object/da085a2d4cca788686b8f68b2555040cf29dc16c/tree/sys/src/cmd/git/add
+++ sys/src/cmd/git/add
@@ -16,11 +16,11 @@
if(~ $#* 0)
exec aux/usage
-paths=`$nl{cleanname -d $gitrel $*}
+paths=`$nl{cleanname -d $gitrel $* | drop $gitroot}
if(~ $add tracked)
- files=`$nl{walk -f $paths}
+ files=`$nl{walk -f ./$paths}
if not
- files=`$nl{cd .git/index9/tracked/ && walk -f $paths}
+ files=`$nl{cd .git/index9/tracked/ && walk -f ./$paths}
for(f in $files){
if(! ~ `$nl{cleanname $f} .git/*){
--- //.git/fs/object/da085a2d4cca788686b8f68b2555040cf29dc16c/tree/sys/src/cmd/git/clone
+++ sys/src/cmd/git/clone
@@ -7,7 +7,7 @@
if(~ $debug 1)
debug=(-d)
-remote=`{echo $1 | subst -g '/*$'}
+remote=`{echo $1 | sed 's@/*$@@'}
local=$2
if(~ $#remote 0)
@@ -79,7 +79,7 @@
tree=.git/fs/HEAD/tree
lbranch=`{git/branch}
- rbranch=`{echo $lbranch | subst '^heads' 'remotes/origin'}
+ rbranch=`{echo $lbranch | subst 'heads' 'remotes/origin'}
echo checking out repository...
if(test -f .git/refs/$rbranch){
cp .git/refs/$rbranch .git/refs/$lbranch
@@ -86,12 +86,10 @@
git/fs
@ {builtin cd $tree && tar cif /fd/1 .} | @ {tar xf /fd/0} \
|| die 'checkout failed:' $status
- for(f in `$nl{walk -f $tree | subst '^'$tree'/*'}){
- if(! ~ $#f 0){
- idx=.git/index9/tracked/$f
- mkdir -p `$nl{basename -d $idx}
- walk -eq $f > $idx
- }
+ for(f in `$nl{walk -f $tree | drop $tree}){
+ idx=.git/index9/tracked/$f
+ mkdir -p `$nl{basename -d $idx}
+ walk -eq ./$f > $idx
}
}
if not{
--- //.git/fs/object/da085a2d4cca788686b8f68b2555040cf29dc16c/tree/sys/src/cmd/git/merge
+++ sys/src/cmd/git/merge
@@ -7,13 +7,12 @@
basebr=$gitfs/object/$2/tree
theirbr=$gitfs/object/$3/tree
- all=`$nl{{git/query -c $1 $2; git/query -c $2 $3} | sed 's/^..//' | \
- subst -g '^('$ourbr'|'$basebr'|'$theirbr')/*' | sort | uniq}
+ all=`$nl{{git/query -c $1 $2; git/query -c $2 $3} | sed 's/^..//' | sort | uniq}
for(f in $all){
ours=$ourbr/$f
base=$basebr/$f
theirs=$theirbr/$f
- merge1 $f $theirs $base $ours
+ merge1 ./$f $theirs $base $ours
}
}
--- //.git/fs/object/da085a2d4cca788686b8f68b2555040cf29dc16c/tree/sys/src/cmd/git/revert
+++ sys/src/cmd/git/revert
@@ -11,8 +11,8 @@
if(~ $#query 1)
commit=`{git/query -p $query}
-files=`$nl{cleanname -d $gitrel $*}
-for(f in `$nl{cd $commit/tree/ && walk -f $files}){
+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
git/add $f
prev parent reply other threads:[~2021-08-14 21:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 19:43 ori
2021-08-12 14:27 ` qwx
2021-08-14 19:24 ` ori [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=182597C39FCD4D67B8227458971887E3@eigenstate.org \
--to=ori@eigenstate.org \
--cc=9front@9front.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).