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

Cherry-picks caused some issues in the past and are non-linear,
maintainer's only operations.

We never documented though, so let's make it clear in our doc.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

This tool is not being used and not being maintained anymore. Remove it
so we don't have to keep solving new issues shown by shellcheck like:

	In qf line 81:
		branch=${quilt_branch#$QUILT_PREFIX}
				      ^-----------^ SC2295 (info): Expansions inside ${..} need to be quoted separately, otherwise they match as patterns.

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

Joonas Lahtinen authored 1 year ago and Lucas De Marchi committed 1 year ago

Fix cherry-pick-fixes to actually work after the generalization effort.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Lucas De Marchi authored 1 year ago and Lucas De Marchi committed 1 year ago

When checking if a url matches one of the urls from the drm_tip_repos
array, commit faa12d34 ("dim_setup: Use "repo" for remote default
name") used a substring match. However, it's possible that a url is a
substring of another, leading to the wrong repo being returned.

Depending on the order of iteration in the drm_tip_repo array,
ssh://git.freedesktop.org/git/drm/drm would match as a substring
of ssh://git.freedesktop.org/git/drm/drm-intel, thus returning drm-intel
rather than drm as repo.

It doesn't always fail because Bash doesn't guarantee the order of
associative arrays. Running with Bash 5.2.15 it works, because it
compares drm's url before drm-intel's. However it was reported that
with 5.0.17 it doesn't follow the same order, and thus causing this
issue.

On a dim setup execution, it errors out like this:

	dim: No git remote for any of the URLs ssh://git.freedesktop.org/git/drm/drm git://anongit.freedesktop.org/drm/drm https://anongit.freedesktop.org/git/drm/drm https://anongit.freedesktop.org/git/drm/drm.git

 found in /path/to/src
	Enter a name to auto-add this remote, leave blank to abort: drm-intel
	error: remote drm-intel already exists.

Also, dim should probably start using `set -e`, because the error above
is ignored and in the end it shows:

	dim setup successfully completed!

Leaving a half-baked setup.

Reported-by: John Harrison <john.c.harrison@intel.com>
Fixes: faa12d34 ("dim_setup: Use "repo" for remote default name")
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Thomas Hellström authored 1 year ago and Lucas De Marchi committed 1 year ago

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

No need to be silent on a y/n reply.

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

Fix error when not using --yes:

	"dim: line 187: [: -eq: unary operator expected"

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

Remove the hardcode arguments to drm-intel branches and add support for
xe. For any future branch, all that would be needed is the mapping
between branch and arguments.

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

It doesn't accept additional cherry-pick arguments.

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

Instead of hardcoding the remote name, derive it from the branch.
This will help adding support for xe.

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

Leftover from previous refactors, not used anymore.

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

Instead of slicing the url and deriving the default name for a remote
from there, use a new url_to_repo function to find the name from the
nightly.conf. This fixes the default name for the drm-xe repo being
called "kernel" since the url is gitlab.freedesktop.org/drm/xe/kernel.git

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

Remembering the right name is a 50% chance, but 90% of them I try with
the same name used by git. Stop fighting muscle memory and support both.

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

On a slow network, most of the time for a setup is taken by the initial
clone of the kernel repository. It's common for kernel developers to
have a kernel clone lying around, so allow to borrow the git objects
from there.

Testing on a relatively fast connection, the initial checkout goes down
from ~7m45s to 2m21s.

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

It's tedious to run setup and having to be around for each prompt. Just
add a -y|--yes switch like we have in package managers to assume
yes/default.

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

The amount of repos/branches is not restricted to the ones in drm-intel
and drm-misc anymore. Now there are topic branches on drm repo and also
the drm-xe repo. Use wildcard matches to list anything under drm-* repos
and any topic branch, even those on drm repo.

One main difference is that now `dim create-workdir all` will really
checkout all topic branches. Users may be advised to checkout only what
it's interesting for them.

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

Add initial documentation describing the xe rules and flow. Also add
the xe maintainers to the dim pull request cc list.

v2:
- Updates suggested by Lucas

v3:
- More updates suggested by Lucas

v4:
- Updates suggested by Oded and Jani.

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>

I occasionally bounce patches to intel-gfx@ to get CI for patches that
were only sent to dri-devel@ or were caught in the moderation
queue. This results in a Resent-From: header being added.

Applying such a patch leads to the From: match in apply_patch() to match
Resent-From: rather than the actual From:. If whoever bounced the patch
is also applying the patch, their Signed-off-by won't be automatically
added.

Match From: from the beginning of the line to fix this.

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

Since commit e700ea2f ("dim: Introduce a new configuration file in
.config/dim") it's not possible to run `dim checkpatch` anymore without
a config file. Check for the existence of both $XDG_CONFIG_HOME/dim/dimrc
and $HOME/.dimrc before sourcing them.

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

The dim configuration has been stored in ~/.dimrc so far, but using
XDG_CONFIG_HOME allows for a tidier home directory.

Introduce a new XDG_CONFIG_HOME/dim/dimrc path.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

XDG_CACHE_HOME is meant to hold "user-specific, non-essential data"
which seems like a good fit and avoids bloating ~.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

XDG_CACHE_HOME is meant to hold "user-specific, non-essential data"
which seems like a good fit and avoids bloating ~.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

The code has multiple places where the .dim-last-path file is
referenced, so let's move it to a variable.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

We currently always cat .dim-last-path and cd to whatever content it
has.

However, it's not guarantee to exists, so the initial cat might not
work. Make sure we only switch to it if the file exists in the first
place.

Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>

bash_completion is sourced from the shell, and thus a call to exit will
kill the current shell session.

Return instead.

Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>

Time to switch over.

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

Sphinx now requires setting the language:

Invalid configuration value found: 'language = None'. Update your
configuration to a valid language code. Falling back to 'en' (English).

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

As we checkpatch the applied commits rather than the patches, avoid
mailmap conversions, if any. Otherwise we might get complaints about
author Signed-off-by missing.

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

GNU grep 3.8 started to complain about backslashes where
they're not needed:
 grep: warning: stray \ before /
Get rid of them.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Apparently my git (v2.40.0) does more warnings and we're not silencing
all the possible ones in the commit_rerere_cache function

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

Introduce stricter rules for topic/core-for-CI management. Way too many
commits have been added over the years, with insufficient rationale
recorded in the commit message, and insufficient follow-up with removing
the commits from the topic branch.

New rules:

1. Require maintainer ack for rebase. Have better gating on when rebases
   happen and on which baselines.

2. Require maintainer/committer ack for adding/removing commits. No
   single individual should decide.

3. Require gitlab issues for new commits added. Improve tracking for
   removing the commits.

Also use the stronger "must" for commit message requiring the
justification for the commit being in topic/core-for-CI.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: dim-tools@lists.freedesktop.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

In case a fix was not propagated yet to upstream, the
original commit sha won't be found hence the fix of this
fix will be missed during the cherry-pick.

Since dim cherry-picks reliably adds the -x "(cherry picked
from" message, let's also grep in the log to see if that
was the case, before we give up and forget.

Also, if that's the case, let's then fix the 'Fixes:' tag.

v2: Actually replaces the 'Fixes:' tag, otherwise dim doesn't
allow us to push giving the following message:
"Fixes: SHA1 in not pointing at an ancestor:"
"dim: ERROR: issues in commits detected, aborting"

v3: - Also consider fix of fixes in drm-intel-fixes besides
      the drm-intel-next-fixes.
    - Use intel_remote branches instead of local.
    - And run the check unconditionally as suggested by Daniel.

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

After setting up drm-rerere, the integration config must be read again
to setup the environment variables with list of remotes/branches.
Otherwise the setup will be left incomplete, with drm-tip and drm-rerere
being the only branches configured.

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

Seems that we've had zero documentation on topic/core-for-CI. Describe
the branch and the current process.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

The .. contents:: directive adds an in-page table of contents for a nice
overview.

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

Maintainer tools is a project of its own. Reference the project page.

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

In line with other repos.

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

Primarily fix the glaring omission of drm-intel-gt-next from the
documentation, but also clarify and clean up other details.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Can't think of why the complicated style for document titles was chosen
to begin with.

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