Another thing to do having obtained a drm-intel-gt-next co-maintainer hat.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

This will allow integrating drm-intel-gt-next with linux-next

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

We have all these reminders to actually type a commit message, but
--no-commit doesn't imply --no-ff, so let's fix that.

Noticed because Maarten managed to do a fast-forward backmerge into
drm-misc-next somehow.

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

It's not exactly trivial to add the smarts to properly check for pushing
backmerges, rebases, topic branches and subtree branches (such as
gvt). For a start, prompt the user with hints about what's going on.

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

We kinda left this out, and I like the wording from the drm-intel
side, so add that. Motivated by a discussion with Christian.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Maxime Ripard <maxime@cerno.tech>
Cc: Christian König <christian.koenig@amd.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Also try the mail address, just in case that matches and all the name
mangling tests we do don't help.

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

Ville Syrjälä authored 4 years ago and Jani Nikula committed 3 years ago

We actually want to use git filter-branch, so make it shut
up and do what it's told.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Ville Syrjälä authored 4 years ago and Jani Nikula committed 3 years ago

Trying to suck in a Fixes tag doesn't work currently due to the
double quotes contained within. Escape those so the shell stuff
doesn't get confused and we get the expected results.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Simon Ser authored 4 years ago and Simona Vetter committed 4 years ago

Python 2 has been end-of-life'd, and d79c5784 ("dim: fix handling of 8-bit
non-UTF-8 messages") relies on functions introduced in Python 3.2.

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

Simon Ser authored 4 years ago and Simona Vetter committed 4 years ago

Python's open() function will return a file object that decodes input
bytes to an UTF-8 string. Python assumes all files are UTF-8 by default
(unless an explicit encoding param is passed).

This works fine with 7-bit and UTF-8 messages. However, when a message
uses a 8-bit Content-Transfer-Encoding and a non-UTF-8 charset (such as
iso-8859-1), Python will error out.

To prevent this, open the file in binary mode to prevent Python from
doing any charset conversion under-the-hood.

Signed-off-by: Simon Ser <contact@emersion.fr>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Switching from using drm-intel-next-queued to drm-intel-next requires a
flag-day change. This is the dim change to switch to drm-intel-next. For
now, keep the sub-command names such as "conq" and "push-queued", and
change everything under the hood. Prevent pushes to
drm-intel-next-queued.

The flag-day change should be rolled with:

1) Bump minimum dim version with DIM_MIN_VERSION=1 in nightly.conf

2) Sync drm-intel-next-queued to drm-intel-next

3) Push this change to maintainer-tools

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

Was disabled because of flaky infrastructure, Benjamin says it's
looking good now.

Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

The character set decoding added in commit b66d07db ("dim: decode
email message content charset to unicode") started failing with unicode
decoding failures under certain conditions. (Specifically python 3 and
mboxes downloaded from patchwork.)

Instead of raising UnicodeDecodeErrors, replace values that can't be
converted with U+FFFD (REPLACEMENT CHARACTER, �).

Reported-by: Dave Airlie <airlied@gmail.com>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Simon Ser authored 4 years ago and Lucas De Marchi committed 4 years ago

Patchwork adds trailing newlines to long Message-Id header fields.
message_get_id returns a string containing the newline, and
dim_commit_add_tag blows up on that:

    sed: -e expression #1, char 57: unknown command: `<'

Signed-off-by: Simon Ser <contact@emersion.fr>
Closes: #17


Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

Remove the special casing of drm-intel-next/drm-intel-next-queued
tagging and pull requests. Instead of having a two-step process for
dinq, follow the same pull request process for all branches. As the
first step, use drm-intel-next-queued for pull requests, and ignore
drm-intel-next for now. The change is only relevant for maintainers.

In the future, we'll want to switch from drm-intel-next-queued to
drm-intel-next completely. This will need a flag day switch for all
committers and maintainers.

We also decouple driver date update from dinq pull requests. We may want
to apply the driver date update to drm-intel-gt-next branch instead.

With the change, we also lose the ability to add multiple drm-intel-next
tags, and create a single pull request for them. In practice, we haven't
really used this possibility, as it lacks the merging of the annotated
tag changelogs together, missing information. We may want to resurrect
the feature in an improved form in the future, generalized for all
branches.

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

Add simple single-digit dim version scheme, and add 'dim version'
subcommand to print it. Start off with version 0.

If $DIM_MIN_VERSION is set, bail out if the requirement is not met. The
idea is to set this in nightly.conf to be able to soft-enforce dim
updates before rolling out changes. (It's obviously possible to bypass
the requirement.)

We do have the dim uptodate nag, but it never bails out.

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

Rodrigo Vivi authored 4 years ago and Jani Nikula committed 4 years ago

v2: With this real minimal version provided by Jani.

Credits-to: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Email messages need two levels of decoding: First, content transfer
encoding, such as base64 or quoted-printable. Second, charset decoding.

We've done the first (with part.get_payload(decode=True)), but we've
ignored the charset. Mostly, it has not mattered, since most email is
ascii or utf-8 anyway, and python2 has been relaxed about it. However,
python3 part.get_payload(decode=True) gives us binary instead of
unicode, so we also need to do the charset decoding to get the result we
want.

The problem has likely been observed only now that 'python' no longer
exists or points at python3 instead of python2.

Use part.get_content_charset() for charset decoding, defaulting to
'us-ascii' source charset if nothing is specified.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Tested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

gitlab builder fails

Also I think it's high time we switch over to gitlab pull requests to
stop stuff like this, because locally make check was all fine.

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

debian stopped having a python link for reasons, so try to find one a
bit harder.

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

Setup instructions don't match the code anymore, ever since the split
to a separate repo we don't set it up automatically anymore. Readd
that - the right link and all was already there.

v2: 100% fewer typos (hopefully)

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

Steven Price authored 4 years ago and Jani Nikula committed 4 years ago

If a Message-Id is wrapped (by the email server or client) then white
space can creep in at the beginning. This causes the generated 'Link:'
tag to be broken. Fix it by stripping spaces as well as '<>'.

Signed-off-by: Steven Price <steven.price@arm.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Arkadiusz Hiler authored 4 years ago and Jani Nikula committed 4 years ago

Running sparse on each commit in the provided range can be very time
consuming for large series.

With --fast switch we treat the whole range as a single change that gets
checked for any new sparse errors.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

dim blew up on the pull from Thomas:

https://patchwork.freedesktop.org/patch/348981/



Thomas helpfully added an in-body From: line, similar to how git
format-patch does. But our dim parsing choked on the double From: line
that resulted in.

Assume that if there's a 2nd From: line it's there for a good reason
and pick that one (like git apply-mbox).

v2: Ditch the debug stuff ... silly me.

Cc: "Thomas Hellström (VMware)" <thomas_os@shipmail.org>
Cc: Dave Airlie <airlied@gmail.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reported-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Benjamin Gaignard authored 5 years ago and Jani Nikula committed 5 years ago

It may happen that author name and signed-off-by are not matching because
of accent characters. Allow push the commit if the name without accent is
matching.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Maintainers seem to like to supply fixed up pull requests in replies
to their previous attempt. Current dim then choked on that pile,
trying to pull the old one (but getting tripped by the various >
quotation marks).

Teach dim to look for a non-quoted pull.

Cc: Dave Airlie <airlied@gmail.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Ville Syrjälä authored 5 years ago and Simona Vetter committed 5 years ago

Refuse the push if there are leftover markers from
dim extract-tags still present in the commit messages.

A few of these slipped through to drm-misc-next. Let's try
to avoid that in the future.

Cc: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Dave asked me how to fix a screwed-up rerere, and I noticed that the
wording/spelling is a bit sub-par.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Maxime Ripard authored 5 years ago and Simona Vetter committed 5 years ago

The current dim code will create the tag using a local branch as an
argument, but while we make sure to fetch the branch first in the callers,
we don't actually make sure that any local change have been pushed.

Make sure it's the case before creating the tag by checking that all local
commits have been pushed to the meaningful remote.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Maxime Ripard authored 5 years ago and Simona Vetter committed 5 years ago

All the users of tag_branch do a push for the created tag as the very next
step. Let's move that into the tag_branch function.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

We expect a clone now since

commit 2e9ddb93
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Fri Jan 11 14:36:48 2019 +0200

    dim: don't setup maintainer-tools as aux checkout

But somehow the getting started pages haven't been updated.

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

Following the recent discussion and the fact that commits can be part of a
pull request without the PR sender being notified (but only the recipient),
let's make sure both ends are notified if there's such commits.

Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Maxime Ripard <mripard@kernel.org>

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Ever since

commit 0dee4cb6
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed Nov 16 17:34:13 2016 +0100

    dim: Make update_linux_next multi-repo compliant

this shouldn't be a problem anymore, but I only commented one fo them
out and must have forgotten about this all.

Reported-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Just a bit of ocd ... One functional change is the switch from $DRY to
the $DRY_RUN flag in dim_pull_request. That one didn't have a
justification, and the one for the other place in dim_create_branch
didn't seem to apply really.

v2: don't substitute too much (Arek)

Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Arkadiusz Hiler authored 5 years ago and Jani Nikula committed 5 years ago

If the commit range that is being checked with 'dim sparse' introduces
new Kconfig options 'make' prompts us for our opinion. Since we are
capturing the stdout and -err the user sees nothing and we are seemingly
stuck.

To avoid that and be as non-interactive as possible let's just squeeze
'make olddefconfig' in-between 'git checkout' and the actual 'make'.

Reported-by: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Resurrect commit e03f7356 ("dim: set magic fdo cookie push-option on
git push") after server side was fixed.

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

This reverts commit e03f7356 ("dim: set magic fdo cookie push-option
on git push"), because:

fatal: the receiving end does not support push options
fatal: The remote end hung up unexpectedly

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

Make it possible for the server side git pre-receive hook to determine
the client is dim and refuse the push otherwise.

Obviously it's possible to set the push-option manually on the git
command line as well, but there's really no plausible denial in that
case.

Cc: Daniel Stone <daniel@fooishbar.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>