X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=git-review;h=7f317d97afdc10b054875520d723d2c3756baf82;hb=b76043cb3f5d7e0a321cf6f7e7cf65c509957e73;hp=c671cd98b3cf9bb62fa28b3a34b6e54f471f160f;hpb=c042ae695606f96726e0ebfdf6a6b5ee12367991;p=rrq%2Freviewtool.git diff --git a/git-review b/git-review index c671cd9..7f317d9 100755 --- a/git-review +++ b/git-review @@ -14,13 +14,13 @@ elif [ $# = 2 ] ; then N=$1 FOCUS=$2 fi -FMT='--pretty=format:%h %d %s' +FMT='--pretty=format:%h [%aN/%as]%d %s' GRAPH="$(git log --graph --full-history "$FMT" --all $FOCUS )" PROJECT="$(git rev-parse --show-toplevel| sed 's/.*\///')" -X=$(echo "$GRAPH" | iselect -t "$PROJECT" -n git-review -p $N -P -K -k/ -kp ) +X=$(echo "$GRAPH"q | iselect -t "$PROJECT" -n git-review -p $N -P -K -k/ -k\? -kp ) [ -z "$X" ] && exit 0 X=( ${(s[:])X} ) @@ -29,11 +29,13 @@ K=$X[2] X=$X[3] if [ "$K" = / ] ; then read "x?Search: " - N=${"$(echo "$GRAPH" | grep -nF "$x")"%%:*} + N=${"$(echo "$GRAPH" | grep -anF "$x")"%%:*} elif [ "$K" = "p" ] ; then # previous commit Z=${"$(git rev-parse ${X}~1)"[1,7]} [ -z "$Z" ] || N=${"$(echo "$GRAPH" | grep -nF "$Z")"%%:*} +elif [ "$K" = "?" ] ; then + git log --no-walk --notes --show-signature --pretty=fuller "$X" | less else FOCUS=$FOCUS git-show-i $X~1 $X fi