I want to add more here.

Also fix an issue where you could never see the usage hint if you
typed the wrong subcommand without setup being done yet.

Acked-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

To make sure the report is actually accurate. Motivated in a
discussion with Joonas.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Take into account git commit e66d7c37a5f1 ("request-pull: capitalise
"Git" to make it a proper noun").

Reported-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reported-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Use a timestamp file to check for updates every 24 hours.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

time was local in dim_rebuild_tip, so not too nice to reference in
functions called from it.

Reported-by: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Seems like a batter name for a global.

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Make it easier to debug potential issues in rerere cache
handling. Adding the commit message using a temp file also makes it
easier to add more breadcrumbs in the future.

Very-much-acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Bail out early on errors to reduce indent. Add local decls while at it.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Otherwise the tree rebuilding fails. This might be the reason why some
git versions create different conflicts, since checking
git-sources/rerere.c didn't provide any hint at all about what has
changed.

Note this is only --local, i.e. for the current git repo, not --global
or --system. But with worktrees that includes a lot more than just the
drm-tip repo. But then we just force the default, so hopefully the
impact is minimal.

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Broken since introduction in cad37e19 ("dim: auto-add remotes"), the
remote asked from the user gets ignored. Get the remote name to the
remote variable. Also bail out on non-zero returns from read.

Cc: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

While at it, drop an old drm-intel reference.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

No reason for the function to be so specific, make it more flexible in
case we need to choose ssh URLs later on. Also rename it
appropriately. Remove the fallback of converting ssh:// URLs to git://
URLs now that we have all the URLs with all the accepted protocols
defined in nightly.conf since drm-rerere commit 7aa4d6332234
("nightly.conf: add url lists to all repos").

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

We have a helper for this, use it.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

dim setup is now the only place that may use them.

Going forward, dim setup could go one step further and dig out
nightly.conf directly from the repo before we've created a worktree
checkout for it.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Since drm_tip_repos now contains drm-tip, we can use it to reduce
dependency on URLs hard-coded in dim.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Since commit 1c228d7de23c ("nightly.conf: add drm-tip and linux-upstream
to drm_tip_repos") in drm-rerere, nightly.conf has drm-tip and
linux-upstream. Don't handle them specially.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Don't assume current directory works.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Look up the remotes using the repo names in nightly.conf.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

We have all the plumbing necessary to figure out the drm-intel
remote. No need to configure it separately.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

The maintainer repo hasn't been Intel specific for a while now. Rename
the variable. DIM_DRM_INTEL is used as a default for DIM_REPO for
backward compatibility.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

The hard-coded list of remotes and branches has gone stale.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Since commit cad37e19 ("dim: auto-add remotes") url_to_remote can't
really fail. Same for repo_to_remote when the repo exists. Redirecting
their output when the remote isn't there leads to url_to_remote waiting
for user input without prompting, giving an appearance of a hang.

While at it, change the exit to a return. set -e at the top takes care
of aborting.

Using git worktrees is now practically required because we need all the
remotes everywhere. Worktrees have been the default for a while now, and
you have to go out of your way to set dim up without worktrees. You can
still get by without, but it'll be clumsy.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

No longer consider drm-intel as the default. All repos need to be
explicitly specified. Improve error reporting in repo_to_remote for
unknown repos.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Add new environment variable $DIM_GPG_KEYID for configuring the GPG key
ID of the key to use for signing tags for pull requests. The tags will
be signed if the key ID is set, otherwise annotated tags will be used
like before.

The drm-intel-testing tags are left unsigned, at least for now.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Presumably an oversight while converting update-next-continue to use
annotated tags.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Ewelina Musial <ewelina.musial@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Signed tags have the signature at the end. Strip them out when preparing
pull mail overviews.

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

It's not perfect or exactly the same, but prefer fewer lines of special
casing anyway.

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Avoid extra pipelines for no good reason.

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

This lets us configure a space separated list of URLs for each repo in
drm_tip_repos, with all accepted protocols and sources, and the first
one found gets picked. This way we don't have to have a complicated set
of rules for converting between ssh, git and https protocol URLs.

Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Most of internal patches are nowadays organized in
quilt subdirectories, but qf was never updated to check
for unused patches there.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Unfortunately there's a little bit of hardcoded stuff still.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Well, bother to at least prompt. Prep work for adding drm-amd.git.

v2: Only print how to add the remove if it's not auto-added (Rodrigo).

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

This reverts commit 41dddc02 and then
tries a different approach because from the commit that originally
introduced this:

commit 3dd25f23
Author: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Date:   Wed Jul 26 14:07:49 2017 +0200

    dim: add checks for author and committer sign-off-by

we have

    "Use real names for people with many different email addresses."

to work around outlook we need to convert the "Last, First" firm into
what git expects instead, which also should solve the problem Rodrigo
has.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Suggested by Chris Wilson and Jani Nikula.

To do this properly we need to again push the reading of nightly.conf
to be after the basic sanity checks, like it was before

commit 12976ee3
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Fri Oct 28 12:40:46 2016 +0300

    dim: switch to using remote agnostic integration branch config

v2: Don't fail on setup.

v3: Rewrite and squash.

v4: Typing code with jetlag, hard it is.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

It also wants to delete drm-rerere/nightly.conf when that hasn't been
touched in a while. Prevent that in the future.

Chris Wilson hit that snag, which then seems to have percolated to
some other committers.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

It seems Patchwork or SMTP servers are messing some patches
and changing the original git's author name on git per "Last, First".
So we end up with a mismatch were signed-off uses one name format
and author is using another format.

So, let's check for email addresses instead.

v2: Avoid useles warning and only check for email.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Make it easier to add/remove people as needed. Add Joonas, Rodrigo and
Sean as new recipients for pull requests. Replace Daniel with Joonas and
Rodrigo as test request recipients.

Perhaps we'll want to make the list branch specific in the future, but
get the low hanging fruit first.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

I think adding a new config for this would be overkill, and this is
bound to be more correct than "Cheers, Daniel".

Leave the generic "Hi all" salute in place though.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Historical baggage from the times this was just Daniel's maintainer
script.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>