Re: [TopGit PATCH 10/10] [RFC] tg-patch: simulate mnemonic prefixes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Oct 08, 2010 at 09:58:08AM +0200, Bert Wesarg wrote:
> b/ is for base, i/ and w/ correspond to -i/-w and t/ is the committed
> topic.
> 
> Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
> ---
>  tg-patch.sh |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tg-patch.sh b/tg-patch.sh
> index dcce672..c8ad723 100644 tg-patch.sh
> --- a/tg-patch.sh
> +++ b/tg-patch.sh
> @@ -6,7 +6,7 @@
>  name=
>  
>  head_from=
> -
> +dst_prefix="t/"
>  
>  ## Parse options
>  
> @@ -15,7 +15,8 @@ while [ -n "$1" ]; do
>  	case "$arg" in
>  	-i|-w)
>  		[ -z "$head_from" ] || die "-i and -w are mutually exclusive"
> -		head_from="$arg";;
> +		head_from="$arg"
> +		dst_prefix="${arg#-}/";;
>  	-*)
>  		echo "Usage: tg [...] patch [-i | -w] [NAME]" >&2
>  		exit 1;;
> @@ -72,6 +73,9 @@ if [ $b_tree = $t_tree ]; then
>  else
>  	# use the ui diff command when the pager is active
>  	diff_command=diff
> +	if $(git config --bool diff.mnemonicprefix); then
> +		diff_command="$diff_command --src-prefix=b/ --dst-prefix=$dst_prefix"
> +	fi
Do I assume right, that diff.mnemonicprefix is topgitish only?   Maybe
it should go then into a topgit namespace?

Hmm, nice idea, the only thing about it I don't like ad hoc is that b/
is already used by default and so it might be confusing.  OTOH you need
to enabled it in the config, ...  Hmm, will think about it.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]