Skip to contentSkip to conversation

$Revision$ keyword replacement?

DISCUSSION Santi Béjar 2 participants 4 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Hello:

I'm looking for a $Revision$ replacement. I know, in git all that matters are the contents. So the equivalent in git could be:

How similar this file is to the file $path in these commit(s)?

What I use now is an ugly shell script (as you might known I'm not a C programer), see the attatchment.

So I get:

311bf741d16ee5d0166639a4fafd9194e504aad3:R094   introduccio.tex sim.tex
b764ee049289f5157238596cccc7a4e15f23896c:R094   introduccio.tex sim.tex
f293e1ab1dfb7ff60cb269ed5b18f9222099a752:R098   introduccio.tex sim.tex
f14c4b2d6799354d376e2026a5b7a85ccce48284:R098   introduccio.tex sim.tex
183af55606310218ca0e9a735dad0827acea7910:R098   introduccio.tex sim.tex
73fd2531cce3db0ca804577fb29f87f413fc4563:R096   introduccio.tex sim.tex

Do you know any other (or better :) way to do it?

Thanks

Santi

#!/bin/sh
##
## find-sim finds the similarity of one file with the files in the
## selected commits
##
## The arguments are:
## $1 - file to compare
## $n n>2 - arguments for git-rev-list to select the commits
##
. git-sh-setup || die "Not a git archive."

[ ! -e $1 ] && exit 1
file=$1
shift

case $GIT_DIR in

    /*)
	GIT_DIR_ORIG=$GIT_DIR;;
    *)
	GIT_DIR_ORIG=$PWD/$GIT_DIR

esac

tmp=mktemp -t -d git-find-sim.XXXXXXX
GIT_DIR_TEMP=$tmp
mkdir -p $GIT_DIR_TEMP/objects/info
[ -e $GIT_DIR_ORIG/objects/info/alternates ] &&
cp $GIT_DIR_ORIG/objects/info/alternates $GIT_DIR_TEMP/objects/info/alternates echo $GIT_DIR_ORIG/objects >> $GIT_DIR_TEMP/objects/info/alternates export GIT_DIR=$GIT_DIR_TEMP

trap "rm -rf $tmp" 0 1 2 3 15

git update-index --add $file || exit 1
tree=git-write-tree

rev_arg=GIT_DIR=$GIT_DIR_ORIG git-rev-parse --default HEAD --revs-only "$@" revs=GIT_DIR=$GIT_DIR_ORIG git-rev-list $rev_arg
for i in $revs; do

    git diff-tree --name-status $i -C $tree | grep $file |
    sed "s/^/$i:/"

done

#1 lore raw

finding similar blobs (was: Re: $Revision$ keyword replacement?

Quoted 1 line · Santi Béjar

How similar this file is to the file $path in these commit(s)?

Very cute.

Quoted 4 lines

tmp=mktemp -t -d git-find-sim.XXXXXXX
...
git update-index --add $file || exit 1
tree=git-write-tree

Are you going through all this trouble just to avoid a blob and a tree object left dangling after you are done? Or is there something else going on?

Quoted 6 lines

rev_arg=GIT_DIR=$GIT_DIR_ORIG git-rev-parse --default HEAD --revs-only "$@" revs=GIT_DIR=$GIT_DIR_ORIG git-rev-list $rev_arg
for i in $revs; do

    git diff-tree --name-status $i -C $tree | grep $file |
    sed "s/^/$i:/"

done

Perhaps

GIT_DIR=$GIT_DIR_ORIG git-rev-list $rev_arg |
while read one
git diff-tree --name-status -r $one -C $tree | grep $file | sed "s/^/$one:/"
done

just in case the similar file you will discover is hidden in a subdirectory?

#2 lore raw

Re: finding similar blobs (was: Re: $Revision$ keyword replacement?

2005/11/22, Junio C Hamano <[email protected]>:

Quoted 4 lines

Santi Béjar <[email protected]> writes:

Quoted 8 lines
Quoted 4 lines

tmp=mktemp -t -d git-find-sim.XXXXXXX
...
git update-index --add $file || exit 1
tree=git-write-tree

Are you going through all this trouble just to avoid a blob and a tree object left dangling after you are done? Or is there something else going on?

No, there is nothing else. These are "easy" avoided, so why have these dangling {blob,tree,...}s?

Quoted 10 lines
Quoted 7 lines

rev_arg=GIT_DIR=$GIT_DIR_ORIG git-rev-parse --default HEAD --revs-only "$@" revs=GIT_DIR=$GIT_DIR_ORIG git-rev-list $rev_arg
for i in $revs; do

    git diff-tree --name-status $i -C $tree | grep $file |
    sed "s/^/$i:/"

done

Perhaps

Quoted 8 lines

GIT_DIR=$GIT_DIR_ORIG git-rev-list $rev_arg |
while read one
git diff-tree --name-status -r $one -C $tree | grep $file | sed "s/^/$one:/"
done

just in case the similar file you will discover is hidden in a subdirectory?

Oops :)

Santi

#3 lore raw

Re: finding similar blobs (was: Re: $Revision$ keyword replacement?

Quoted 2 lines · Santi Bejar

No, there is nothing else. These are "easy" avoided, so why have these dangling {blob,tree,...}s?

Only because I am lazy ;-).