Commit ea3d1418 ("dim: Use git apply to apply patch") changed dim
behaviour in that it now accepts fixup patches that can create new
files, and those need to be applied using 'git apply' instead of plain
'patch'. Bump dim version to 2 to be able to require this feature.

We'll also need to bump the dim version requirement (DIM_MIN_VERSION) to
2 in nightly.conf to account for the fixups that need this change.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

This allows us to add new files in a fixup, required for unbreaking
drm-tip.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>

The dim tool supports a cherry-pick that is a glorified version of the git
command but adds additional metadata and checks if there are any follow-up
commits referencing the one being cherry-picked.

Let's document in the getting started page that the dim command should be
used instead of just git cherry-pick. That way people will be aware of it.

This is useful to avoid cherry-picking commits but miss existing fixes for
them, which would introduce unnecessary regressions in the target branch.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Even in feature freeze it can happen that the broken patch is only in
drm-misc-next, and then applying to drm-misc-next-fixes will
rightfully stumble over dim's Fixes: validation since the sha1 wont be
an ancestor.

Fix that by adding another check.

v2: Less confusing wording (Marek)

Reviewed-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

We call assert_repo_clean() from a few places and for some of them, it's
not clear PWD would matter, example: dim ub

Clarify what's the working tree dim is complaining about.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

This is useful for generating drm-tip without pushing, so one can try a
build from drm-tip branch before pushing.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

If we already have a fixup file for a certain branch, we would override
any previous fixups. Just appending to the previous diff (even if
already containing the same path) seems to work better.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

If the email comes from a source that encodes the mbox body as base64
for whatever reason, the grep would fail. If it fails, fallback to using
git-mailinfo which will re-encode it.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

Javier Martinez Canillas authored 3 years ago and Simona Vetter committed 3 years ago

By default the git-format-patch command generates patches with prefixes
for the source and destination (-p1), and is also what git-am uses as a
default. The command strips the first leading path component when patch
is applied (unless a different -p<num> argument is used).

But the patch generating behaviour can be changed with git-format-patch
--no-prefix argument (or setting 'diff.noprefix = true' in .gitconfig).

Patches with no source and destination prefixes can confuse the git-am
3-way merge logic, since stripping the first path component will lead
to wrong paths for newly added files.

To avoid this, check that patches to apply are using git-format-patch's
defaults prefixes to make sure that git-am defaults are safe to use too.

Since there are developers that generate patches without using git, make
this an error but allow to still continue when using the dim -f option.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Way out of date.

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

They're very often just beaurocratic paperwork pushing because
maintainers refuse to give acks for merging patches through a single
tree. I guess the snarky intro wasn't clear enough, so elaborate.

Given that we don't even talk about topic branches anywhere else in
the docs hopefully this makes things a bit clearer.

v2: Fix typo (Maarten)

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

We should never run the pull with the rebase strategy. Ever.

That messes up with our commits. Specially with the top
one where dim expects a merge commit and it amends from and
link info.

So, let's forbid the rebase strategy overriding any user
config.

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

        if [[ "x$1" = "xcd" ]]; then
              ^---^ SC2268: Avoid x-prefix in comparisons as it no longer serves a purpose.

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

There's nothing we can do, but also I was baffled about what's going on.
The reason was that a topic branch was deleted on the server, but not
removed from nightly.conf. Which means git merge fails, but not in a way
we expect, so we keep falling over until this git commit (which should
always succeed) also falls over and the scrip just stops.

Make the failure a notch more verbose for next time around.

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

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>