public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf.
Date: Tue, 22 Aug 2017 10:33:36 +0300	[thread overview]
Message-ID: <87d17o5a5r.fsf@nikula.org> (raw)
In-Reply-To: <20170821201120.2205-30-rodrigo.vivi@intel.com>

On Mon, 21 Aug 2017, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> Soon we will need to extend qf for very specific
> usages of our internal maintenance and rebase bot.
>
> So instead of creating yet another config file
> let's use the existent one.

I think I'd prefer a separate config file for qf.

BR,
Jani.

>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  dimrc.sample |  9 ++++++++-
>  qf           | 18 +++++++++++++++---
>  2 files changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/dimrc.sample b/dimrc.sample
> index be7b99cb6b76..bbddecabd519 100644
> --- a/dimrc.sample
> +++ b/dimrc.sample
> @@ -1,4 +1,4 @@
> -# Sample configuration file for dim. Place this at $HOME/.dimrc or point
> +# Sample configuration file for dim and qf. Place this at $HOME/.dimrc or point
>  # DIM_CONFIG environment variable to it.
>  #
>  # Defaults are in the comments below.
> @@ -20,3 +20,10 @@
>  
>  # Command to run after dim apply
>  #DIM_POST_APPLY_ACTION=
> +
> +#
> +# qf
> +#
> +
> +# Quilt branch prefix
> +#QUILT_PREFIX=
> \ No newline at end of file
> diff --git a/qf b/qf
> index be234e72fa15..befdb2c15b5f 100755
> --- a/qf
> +++ b/qf
> @@ -26,12 +26,24 @@
>  
>  # quilt git flow script
>  
> -# config
> -QUILT_PREFIX=quilt/
> -
>  # fail on any goof-up
>  set -e
>  
> +#
> +# User configuration. Set in environment or configuration file. See
> +# dimrc.sample for an example.
> +#
> +
> +# dim configuration file
> +DIM_CONFIG=${DIM_CONFIG:-$HOME/.dimrc}
> +if [ -r $DIM_CONFIG ]; then
> +	# shellcheck source=/dev/null
> +	. $DIM_CONFIG
> +fi
> +
> +# prefix for quilt branch
> +QUILT_PREFIX=${QUILT_PREFIX:-quilt/}
> +
>  function cd_toplevel
>  {
>  	cd $(git rev-parse --show-toplevel)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-08-22  7:34 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-21 20:10 [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 02/30] qf: Introduce subcommand and aliases Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 03/30] qf: Move "setup" from case to new subcommand Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 04/30] qf: Move "checkout" " Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 05/30] qf: Move "rebase" " Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 06/30] qf: Move "refresh" " Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 07/30] qf: Move "export" " Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 08/30] qf: Move "export-visualize" " Rodrigo Vivi
2017-08-21 20:10 ` [maintainer-tools PATCH 09/30] qf: Move "push" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 10/30] qf: Move "fetch" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 11/30] qf: Move "pull" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 12/30] qf: Move "stage" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 13/30] qf: Move "wiggle-push" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 14/30] qf: Move "resolved" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 15/30] qf: Move "apply" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 16/30] qf: Move "patch-amend" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 17/30] qf: Move "list-unused-patches" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 18/30] qf: Move "baseline" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 19/30] qf: Move "git" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 20/30] qf: Move "gitk" " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 21/30] qf: SC2006 - Fix one of shellcheck complains on qf Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 22/30] qf: SC2068 - Fix another shellcheck complain Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 23/30] qf: SC2053 - Fix another shellcheck complain: Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 24/30] qf: SC2155 - Fix another shellcheck complain Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 25/30] qf: SC2035 " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 26/30] qf: SC1091 " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 27/30] qf: SC2153 " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 28/30] qf: SC1083 " Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 29/30] qf: Add it to shellcheck part of make check Rodrigo Vivi
2017-08-21 20:11 ` [maintainer-tools PATCH 30/30] qf: Use .dimrc to config and extend qf Rodrigo Vivi
2017-08-22  7:06   ` Daniel Vetter
2017-08-22 12:46     ` Daniel Vetter
2017-08-22 12:49       ` Jani Nikula
2017-08-22  7:33   ` Jani Nikula [this message]
2017-08-22 18:16     ` Rodrigo Vivi
2017-08-23 15:13       ` Daniel Vetter
2017-08-23 17:23         ` [maintainer-tools PATCH] qf: Introduce .qfrc Rodrigo Vivi
2017-08-24  6:33           ` Daniel Vetter
2017-08-22  6:55 ` [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand Daniel Vetter
2017-08-22  7:36   ` Daniel Vetter
2017-08-22 18:00     ` Rodrigo Vivi
2017-08-22 18:17   ` [PATCH] qf: Introduce subcommand and aliases Rodrigo Vivi
2017-08-22  7:34 ` [maintainer-tools PATCH 01/30] qf: Deprecate the use of qf without any subcommand Jani Nikula

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87d17o5a5r.fsf@nikula.org \
    --to=jani.nikula@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=rodrigo.vivi@intel.com \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox