We can't check this when applying (since r-b/a-b tags often get added
afterwards), but we can check this when pushing. This only looks at
patches authored by the pusher.

Also update the docs to highlight that review requirements hold
especially also for bugfixes.

v2: committer instead of committer (Sean/Chris).

Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <deathsimple@vodafone.de>
Cc: Sean Paul <seanpaul@chromium.org>
Acked-by: Sean Paul <seanpaul@chromium.org>
Acked-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Sean Paul authored 7 years ago and Simona Vetter committed 7 years ago

In the merge timeline, remove the misc-next ~> drm-next merges while
the merge window is active, and during rc1. Pulls should only be requested
between rc2 and rc5.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Sean Paul authored 7 years ago and Jani Nikula committed 7 years ago

Each pull request is accompanied by a summary that is stored in the git tag
from which it is generated. These summaries all share the same template with
headers classifying changes to UAPI, Cross-subsystem, Core, and Drivers. This
patch adds this template to the tag summary automatically in dim pull-request.

Changes in v2:
  - Tweaked the template var name s/PULL/TAG/ (Daniel)
Changes in v3:
  - Use git tag -F- to ingest template (Jani)
  - Tweak naming/comments again to hopefully clarify things (Jani)

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Sean Paul authored 7 years ago and Simona Vetter committed 7 years ago

Add a bit more colour to the -misc branch explanations, and add a merge timeline
similar to the chart used in drm-intel.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Sean Paul authored 7 years ago and Simona Vetter committed 7 years ago

Along with a recipe for creating a topic branch and sending a pull
request from it.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

This probably explains our fun today - remove-branch only removed the
branch, but didn't push out the nightly.conf change.

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

We've just had some fun with a branch being deleted, but not
immediately noticed because the remote tracking branch was still
there. Make sure we catch such fumbles faster in the future.

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

Eric Engestrom authored 7 years ago and Jani Nikula committed 7 years ago

This fixes `make check` when dim is not configured.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Eric Engestrom authored 7 years ago and Jani Nikula committed 7 years ago

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

I butchered the tagging when implementing Jani's idea for
fallback-tags in:

commit c0c0d0c3
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Mar 21 10:08:01 2017 +0100

    dim: Stop force-pushing tags

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

The functions have been added kind of in the middle at some point. Clean
it up.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reserve the middle part of the script for function and alias definitions
only.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

It's rather obnoxious to exit in the middle of something just because
you haven't updated the script. Only issue a warning.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Somehow fell apart again in testing, let's do the same thing as with
apply-branch, where we also apply the Link: after the sob is added.

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

Don't fire up an editor by default. Requested by Jani.

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

Sean Paul authored 7 years ago and Simona Vetter committed 7 years ago

Instead of hardcoding ~/tmp in dim (and failing when it doesn't
exist), use mktemp to create the pull-request mail file.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Does a few sanity checks to avoid common gotchas:
- make sure the backmerge is in drm-tip already
- check that git rerere resolves all conflict, and cuation if not
- merge commit template.

v2: Spelling fix (Sean)

Cc: Sean Paul <seanpaul@chromium.org>
Acked-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

I think the initial experiment worked fairly well, and the
kickstarting of a review (well, ack/best practices really) market
seems to work ok-ish too. I think we can try to make it (slowly) scale
to more drivers, with driver teams interested in being part of
drm-misc. I do think we need to be careful though, to make sure we
don't overstretch the review/mentoring bandwidth and can improve
process&tooling as we go.

v2: Spelling fix (Jani).

Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Shawn Guo <shawnguo@kernel.org>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Cc: Dave Airlie <airlied@redhat.com>
Acked-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

I'm getting real lazy, let's start scripting this. Very rough draft,
but adds a Link: (patchwork tracks pull requests too, maybe we'll
start CI-ing them too), and sob line. In the future we might add more
checks here ...

v2: Review from Jani:
- Move abbrevation into my own .dimrc
- Drop shift, we don't use $@

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

  authored 8 years ago and Simona Vetter committed 7 years ago

Just a bunch of trivial typos that caught my eye while perusing the
documentation.

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

This repo stopped being my own personal turf a long time ago ...

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

This will print a generic usage error message and bail out on required
arguments missing. This is in preparation for enabling 'set -u'.

This is not an exhaustive conversion, but a good start.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Use -s for "strict" to 'set -u'. Fix the variable references to not fail
before subcommand call. The goal is to unconditionally 'set -u' at the
top, but it can't be done in one go, so add a way to test drive first.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Inspired by Jani's efforts to clean this up and structure it better.

v2: Move the FIXME to TODO and polish the documentation per Jani's
feedback.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

It's kinda beyond just drm-intel nowadays ...

Idea from Jani on irc.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

I wanted to get Sean Paul to run the drm-misc show for a bit, for
training reasons and to increase the bus factor. And then realized
there's no docs about what maintainers are doing.

Fix that.

v2: Add backmerges and taking the blame.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Grammatically better, already documented that way too. While at it,
remove the leftover alias documentation for for-each-workdir.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Group the man page by:

- commands for developers
- commands for committers and maintainers
- advanced commands for committers and maintainers
- commands for maintainers
- dim help commands.

We have so many commands by now that it should be helpful to group them
a little.

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

Hopefully increases clarity for people not working on drm-intel.

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

Out of scope for dim, and relies on hard coded paths. People can add the
function to their .dimrc if needed.

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

Increase clarity. People can list the aliases using 'dim list-aliases'
and add their own.

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

Just a simple grep.

v2: also add 'make check' to run all checks (Daniel)

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

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

Add bash_completion to 'make shellcheck' target, and fix the failures.

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

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

For example, piping from emacs only pops up the stdout/stderr buffer
when the exit code is non-zero.

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

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

Return the exit code to let callers make better decisions on what to do.

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

We apply the patch regardless of the warn_or_fail result, so just switch
to using an error message.

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