RE: What's in git.git

["Luck, Tony" <tony.luck@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

> Yup.  Sorry I did not make that clear.  You deserve the credit.
Thanks (and that wasn't a grumble, just a point of information)

> I am beginning to feel this workflow might benefit from some
> tool support, but I haven't had enough experience to talk about
> exactly what they are yet.
I feel that I have settled into a rut.  My topic workflow works
fairly well, so I'm not really working on cleaning any remaining
rough edges.  It will be good to have some other eyes (especially
some eyes that have been keeping a close eye on all the new features
that have been added to the rest of git) looking at this.

> For example, listing topics that have ever been merged into a
> particular branch, listing topics that have not been fully
> merged into a particular branch, etc. are things I find myself
> doing frequently.  I vaguely recall seeing your post that has
> these things.

At the end of the using-topic-branches file there is an example
"status" script.  My real script has had some updates (see attached)
that reports on extra bits (like whether Linus as made new packfiles
that I should pull down). And ignoring some special (to me) branch
names when reporting.  But it has lots of hard-coded paths for my
workflow. Branches "linus", "release" and "test" are very special.
I have no "master" or "origin" branches at all.  But the net output
seems to be what you want ... for each topic branch it reports
whether that branch has already been merged to the test/release/linus
branches, and whether I have commits in my release branch that are
not in test.

-Tony

[-- Attachment #2: tl-status --]
[-- Type: application/octet-stream, Size: 2073 bytes --]

#!/bin/bash

# report on status of my ia64 GIT tree

gb=$(tput setab 2)
rb=$(tput setab 1)
restore=$(tput setab 9)

# Get status of trees @ kernel.org
eval $(socksify ssh master.kernel.org '\
echo release=$(cat scm/linux-2.6.git/refs/heads/release) ; \
echo test=$(cat scm/linux-2.6.git/refs/heads/test) ; \
echo linus=$(cat torvalds/linux-2.6.git/refs/heads/master) ; \
echo packfiles=\"$(ls torvalds/linux-2.6.git/objects/pack)\" ')

cd /home/aegl/GIT/work

echo $gb ======= linus ====== $restore
local=`cat .git/refs/heads/linus`
if [ "$linus" = "$local" ]
then
	echo -e "\tUp to date"
else
	echo -e "\tNeed to pull from kernel.org"
fi

eval $(echo mypackfiles=\"$(ls .git/objects/pack)\")
if [ "$packfiles" != "$mypackfiles" ]
then
	echo $rb New packfiles in Linus tree $restore
	echo He has "<$packfiles>"
	echo I have "<$mypackfiles>"
fi

for branch in release test
do
	echo $gb ======= $branch ====== $restore
	local=`cat .git/refs/heads/$branch`
	if [ "${!branch}" = "$local" ]
	then
		echo -e "\tUp to date"
	else
		echo -e "\tNeed to push to kernel.org"
	fi
	if [ `git-rev-list linus ^$branch | wc -l` -gt 0 ]
	then
		echo -e "\tNeeds merge from linus"
	fi
done

if [ `git-rev-list release --no-merges ^test | wc -c` -gt 0 ]
then
	echo $rb Warning: commits in release that are not in test $restore
	git-whatchanged release ^test | git-shortlog
fi

for branch in `ls -rt .git/refs/heads | awk '{print $NF}'`
do
	case "$branch" in
	linus | release | test | base-* | bad-* | EXP-* )
		continue
		;;
	esac

	age=$(git-cat-file commit $branch | grep '^author' | awk '{print $(NF-1)}')
	echo -n $gb ======= $branch "(`showtime $age`)" ====== $restore " "
	status=
	for ref in test release linus
	do
		if [ `git-rev-list $branch ^$ref | wc -c` -gt 0 ]
		then
			status=$status${ref:0:1}
		fi
	done
	case $status in
	trl)
		echo $rb Need to pull into test $restore
		;;
	rl)
		echo "In test"
		;;
	l)
		echo "Waiting for linus"
		;;
	"")
		echo $rb All done $restore
		;;
	*)
		echo $rb "<$status>" $restore
		;;
	esac
	git-whatchanged $branch ^linus | git-shortlog
done