Subject: Re: [TopGit PATCH 3/6] tg-files: list files changed by the topic branch

From: Uwe Kleine-König <[email-masked]>
Date: Mon, 4 Oct 2010 00:03:30 +0200

Hi Bert,

On Sun, Oct 03, 2010 at 11:25:54PM +0200, Bert Wesarg wrote:
> this could also be a --name-only option to tg-patch. But I Like the
> similarity to 'quilt files'.
> 
> Signed-off-by: Bert Wesarg <[email-masked]>
> 
> ---
>  .gitignore                 |    2 +
>  README                     |    8 ++++++
>  contrib/tg-completion.bash |    1 +
>  tg-files.sh                |   52 ++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 63 insertions(+), 0 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 0342e09..0dc4d0e 100644 .gitignore
> --- a/.gitignore
> +++ b/.gitignore
> @@ -22,6 +22,8 @@
>  /tg-depend.txt
>  /tg-export
>  /tg-export.txt
> +/tg-files
> +/tg-files.txt
>  /tg-import
>  /tg-import.txt
>  /tg-info
> diff --git a/README b/README
> index f103d92..46f564a 100644 README
> --- a/README
> +++ b/README
> @@ -272,6 +272,14 @@ tg depend
>  
>  	TODO: Subcommand for removing dependencies, obviously
>  
> +tg files
> +~~~~~~~~
> +	List files changed by the current or specified topic branch.
> +
> +	Options:
> +	  -i		list files based on index instead of branch
> +	  -w		list files based on working tree instead of branch
> +
>  tg info
>  ~~~~~~~
>  	Show a summary information about the current or specified
> diff --git a/contrib/tg-completion.bash b/contrib/tg-completion.bash
> index 0ee233c..38567d0 100755 contrib/tg-completion.bash
> --- a/contrib/tg-completion.bash
> +++ b/contrib/tg-completion.bash
> @@ -467,6 +467,7 @@ _tg ()
>  	delete)      _tg_delete ;;
>  	depend)      _tg_depend ;;
>  	export)      _tg_export ;;
> +	files)       _tg_patch ;;
>  	help)        _tg_help ;;
>  	import)      _tg_import ;;
>  	info)        _tg_info ;;
> diff --git a/tg-files.sh b/tg-files.sh
> new file mode 100644
> index 0000000..0723bf1 tg-files.sh
> --- /dev/null
> +++ b/tg-files.sh
> @@ -0,0 +1,52 @@
> +#!/bin/sh
> +# TopGit - A different patch queue manager
> +# (c) Petr Baudis <[email-masked]>  2008
> +# GPLv2
> +
> +name=
> +
> +topic=
> +diff_opts=
> +diff_committed_only=yes	# will be unset for index/worktree
> +
> +
> +## Parse options
> +
> +while [ -n "$1" ]; do
> +	arg="$1"; shift
> +	case "$arg" in
> +	-i)
> +		topic='(i)'
> +		diff_opts="$diff_opts --cached";
> +		diff_committed_only=;;
> +	-w)
> +		topic='(w)'
> +		diff_committed_only=;;
> +	-*)
> +		echo "Usage: tg [...] files [-i | -w] [NAME]" >&2
> +		exit 1;;
> +	*)
> +		[ -z "$name" ] || die "name already specified ($name)"
> +		name="$arg";;
> +	esac
> +done
> +
> +
> +[ -n "$name"  -a  -z "$diff_committed_only" ]  &&
> +	die "-i/-w are mutually exclusive with NAME"
> +
> +[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
> +base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
> +	die "not a TopGit-controlled branch"
> +
> +# if not index/worktree, topic is current branch
> +[ -z "$topic" ] && topic="$name"
> +
> +
> +
> +# Evil obnoxious hack to work around the lack of git diff --exclude
> +git diff --name-only $diff_opts "$base_rev" ${diff_committed_only:+"$name"} -- |
> +	fgrep -vx ".topdeps" |
> +	fgrep -vx ".topmsg" || : # fgrep likes to fail randomly?
Instead of using fgrep you could export the branch and call git diff
--name-only $diff_opts on the resulting commit?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |