From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: git@vger.kernel.org, pasky@suse.cz,
martin f krafft <madduck@madduck.net>
Subject: Re: [TopGit PATCH 10/10] [RFC] tg-patch: simulate mnemonic prefixes
Date: Sat, 9 Oct 2010 22:46:40 +0200 [thread overview]
Message-ID: <20101009204640.GP29673@pengutronix.de> (raw)
In-Reply-To: <101fe6e1e47292faa21770ab3a5a0b204897ac63.1286524446.git.bert.wesarg@googlemail.com>
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@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"
> + 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/ |
next prev parent reply other threads:[~2010-10-09 20:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-08 7:57 [TopGit PATCH 01/10] cat_file: take -i/-w parameters Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 02/10] pretty_tree: globalize and respect -i/-w options Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 03/10] branch_empty: use pretty_tree and therefore respect -i/-w Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 04/10] tg-path: use pretty_tree and diff-tree to generate the patch Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 05/10] list_deps: accept -i/-w Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 06/10] tg-summary: " Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 07/10] tg-files: list files changed by the topic branch Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 08/10] tg-prev/tg-next: commands to explore dependencies Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 09/10] [RFC] tg-patch: use ui diff when pager is active Bert Wesarg
2010-10-08 7:58 ` [TopGit PATCH 10/10] [RFC] tg-patch: simulate mnemonic prefixes Bert Wesarg
2010-10-09 20:46 ` Uwe Kleine-König [this message]
2010-10-09 21:03 ` Bert Wesarg
2010-10-09 20:43 ` [TopGit PATCH 09/10] [RFC] tg-patch: use ui diff when pager is active Uwe Kleine-König
2010-10-10 8:04 ` Bert Wesarg
2010-10-09 20:32 ` [TopGit PATCH 01/10] cat_file: take -i/-w parameters Uwe Kleine-König
2010-10-09 20:57 ` Bert Wesarg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101009204640.GP29673@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=madduck@madduck.net \
--cc=pasky@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).