Re: [TopGit PATCH 10/10] [RFC] tg-patch: simulate mnemonic prefixes
- From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
- Date
- Oct 9, 2010, 20:46 UTC
- Message-ID
- <20101009204640.GP29673@pengutronix.de>
- In-Reply-To
- <101fe6e1e47292faa21770ab3a5a0b204897ac63.1286524446.git.bert.wesarg@googlemail.com>
On Fri, Oct 08, 2010 at 09:58:08AM +0200, Bert Wesarg wrote:
Show 38 quoted lines
> b/ is for base, i/ and w/ correspond to -i/-w and t/ is the committed
> topic.
>
> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
> ---
> 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"
> + fiDo 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/ |