Commits · 2e182dee57575eb2c82794a33b67bc66d7d6dd16 · drm / maintainer-tools

Nov 08, 2016

dim: add a variable for nightly.conf · 2e182dee

Jani Nikula authored 8 years ago


We'll change the name at some point, add some indirection, with a
generic variable name.

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

2e182dee

Oct 28, 2016
- dim: include "dim:" prefix to error messages in echoerr · 40bb703a
  Jani Nikula authored 8 years ago
  
  Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  40bb703a
Oct 27, 2016

dim: bikeshed dim setup a bit · eaf342e3

Simona Vetter authored 8 years ago


echoerr for error output, and start them with an explanation for
what's amiss. Also adjust the check to look for a .git directory, not
just any directory.

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

eaf342e3

Oct 26, 2016

dim-update-next: Update DRIVER_TIMESTAMP · 5fa0e95a

Chris Wilson authored 8 years ago and

Jani Nikula committed 8 years ago


Along with the DRIVER_DATE, also update the DRIVER_TIMESTAMP as measured
in seconds from the start of the epoch.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

5fa0e95a

dim: use get_maintainers.pl in dim fixes · 522e494f

Simona Vetter authored 8 years ago and

Jani Nikula committed 8 years ago


For even more Cc! Result is sometimes a bit excessive and will
need some trimming sometimes.

v2: Don't sort, since that makes a mess of the list. Use magic awk
command found through googling instead.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[Jani: fix some indentation, add --pattern-depth 1 option]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

522e494f

dim: add revert-rerere · 783346cd

Simona Vetter authored 8 years ago and

Jani Nikula committed 8 years ago


Encodes the best practices for undoing a botched-up conflict
resolution.

v2: Rebased to pull prep work before the dim reorg.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
[Jani: fix some typos]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

783346cd

dim: use git branch --list · 8385aea0

Simona Vetter authored 8 years ago and

Jani Nikula committed 8 years ago


... instead of git branch | grep. Handles submatches and branches
starting with - reliably. Motivated by a review from Jani.

v2: Rebase ahead of the bigger dim reworks (requested by Jani).

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

8385aea0

dim: Nuke nightly-forget · 2624edba

Simona Vetter authored 8 years ago and

Jani Nikula committed 8 years ago

With our proliferation of branches it's become long useless. Nowadays
my MO is to revert the offending commit in the rerere-cache branch
explicitly, remove drm-intel-nightly/.git/rr-cache and then re-run
rebuild-nightly. That works much better, hence nuke this helper.

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

2624edba

dim: echoerr helper for printing to stderr · b8bacd7e
Simona Vetter authored 8 years ago and Jani Nikula committed 8 years ago
```
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
```
b8bacd7e

dim: Autocheck for up-to-dateness · 8d225bba

Simona Vetter authored 8 years ago and

Jani Nikula committed 8 years ago


Exits script to annoy people roughly every 100th time ...

Also switch to the magic @{upstream} reference, in case the remote is
not called origin (which is pretty normal in case of using git
worktree).

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

8d225bba

dim: Extract TODO · 573599d8

Simona Vetter authored 8 years ago and

Jani Nikula committed 8 years ago


Just maybe a bit more visibility, the scripts are growing.

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

573599d8

Oct 11, 2016

dim: add command to check for dim updates · 9bc5a872

Jani Nikula authored 8 years ago


Add a command to check if the user is running an up-to-date version of
dim.

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

9bc5a872

dim: add dim sparse subcommand to run sparse on a commit range · d0a01aed

Jani Nikula authored 8 years ago


Run sparse only on files that have changed in the range.

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

d0a01aed

dim: add DIM_MAKE_OPTIONS configuration · 3b574738

Jani Nikula authored 8 years ago


Defaults to -j20.

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

3b574738

dim: clean up the rm's in dim checker · 08a82cdd

Jani Nikula authored 8 years ago


The -f option does what the doctor orders.

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

08a82cdd

dim: columnize usage output if column(1) is available · c1073aed

Jani Nikula authored 8 years ago


The usage has become a bit unwieldy with the command list.

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

c1073aed

dim: refer to the script itself by basename without path · e22ef12d

Jani Nikula authored 8 years ago


Add $dim for the basename of the script and use it.

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

e22ef12d

Sep 30, 2016

dim: have dim fixes print Cc's from commit being fixed first · b7a62f82

Jani Nikula authored 8 years ago


The user can eyeball the list of Cc's while git churns through history
to figure out whether the fix belongs in stable or not.

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

b7a62f82

dim: add dim cite subcommand · bf9a82e2

Jani Nikula authored 8 years ago


Add 'dim cite' subcommand to cite the supplied committish in format
'sha1 ("commit subject")'.

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

bf9a82e2

dim: add more <> around Cc'd mailing list addresses · 6a117773
Jani Nikula authored 8 years ago
```
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
```
6a117773

Sep 26, 2016

dim: force-push drm-intel-next · 0eb111fe

Simona Vetter authored 8 years ago


When cherry-picking hotfixes, this can happen. And I can't rebase
drm-intel-next-queued any more to fix it up like before.

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

0eb111fe

Sep 23, 2016

dim: Auto-add Cc: lines for dim fixes · f53169ec
Simona Vetter authored 8 years ago
```
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
```
f53169ec

dim: add <> around stable m-l address · c6f54abf

Simona Vetter authored 8 years ago


Without those git send-email tries to cc the patch to "#" and "v4.7+",
which upsets gmail ...

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

c6f54abf

Aug 29, 2016
- dim: add kernel version tag to cc: stable and fixes · 75da0ae1
  Jani Nikula authored 8 years ago
  
  Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  75da0ae1
Jul 11, 2016
- dim: Drop Yi Sun from qa recipients · 60c44a12
  Simona Vetter authored 8 years ago
  
  Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
  60c44a12
May 10, 2016

dim: Resist committing patches that modify files outside of i915 · 01175e63

Joonas Lahtinen authored 8 years ago


If committing to drm-intel-next-queued branch, require the committer
to be aware that they are committing outside of drm/i915 maintenance
scope.

v2:
- Do not use warn_or_fail (Jani)
- Only apply to drm-intel-next-queued branch (Daniel)

v3:
- Do not use HEAD but $commit (Jani)

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

01175e63

Mar 23, 2016

dim: Teach fixes subcmd about Cc: stable/-fixes · 7c923e89

Simona Vetter authored 9 years ago

It's explained in the rules, but tricky. Let's use computers to get it
right ;-)

Note that Cc: drm-intel-fixes has a few false positives since the
script can't predict when exactly the feature cutoff is going to be.
But that's better than losing a few bugfixes.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Acked-by: Imre Deak <imre.deak@intel.com>

7c923e89

Mar 22, 2016
- dim: abstract git commit range expansion helper · c53b63ce
  Jani Nikula authored 9 years ago
  
  Signed-off-by: Jani Nikula <jani.nikula@intel.com>
  c53b63ce
Mar 21, 2016

dim: turn commit-add-tag into a proper dim subcommand · 4ed315aa

Jani Nikula authored 9 years ago


This lets you add e.g. review tags to a commit on the command line:

$ dim commit-add-tag "Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com&gt;">

This could be used as a building block for further scripting.

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

4ed315aa

dim: Avoid false positives with BUG detection · d0f0458d

Tvrtko Ursulin authored 9 years ago


Makes sure that the diff line adding the BUG is not immediately
preceded by the diff line removing the BUG. Or in other words,
avoids false positives when existing BUG is edited.

v2: Sent the incomplete version out...

v3: Rebase.

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

d0f0458d

Mar 16, 2016
- dim: add todo about better dry-run for rebuild-nightly · fc3097bc
  Simona Vetter authored 9 years ago
  
  fc3097bc
Mar 15, 2016

dim: unify repo clean checks to a single assert_repo_clean helper · f5cc4b02

Jani Nikula authored 9 years ago


Moreover, 'git diff-index --quiet HEAD' kept failing on me even though
the repo was clean (merely running 'git status' always fixed this). So
use the other one.

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

f5cc4b02

dim: run checkpatch on committed patches on apply · 3e7abf9f

Jani Nikula authored 9 years ago


The input messages may have base64 encoding and whatnot, and
checkpatch.pl can't cope with them. Just let 'git am' handle that. The
upside is that checkpatch will now catch e.g. duplicate signed-off-bys.

This is a partial revert of

commit a913db69
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed Oct 14 18:32:49 2015 +0200

    dim: Store patch in a temp file in apply-patch

although we'll still keep the temp file for other purposes, such as
extracting the message-id.

While at it, drop the obsolete check for drm_i915_private_t. We'll now
get a build fail for that.

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

3e7abf9f

dim: have update-branches also fetch origin and drm upstream repos · 01a54197

Jani Nikula authored 9 years ago


Convenient in many cases, but not as intrusive as full remote update.

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

01a54197

dim: update for-next branches as part of nightly rebuild · 58bf80c2

Jani Nikula authored 9 years ago

Currently the for-linux-next-fixes and for-linux-next branches only get
updated after the nightly rebuild after pushing branches. If the nightly
rebuild fails at that point, the for-next branches won't get updated
until the next time something is pushed, not upon nightly rebuild. Fix
this by making for-next branch update part of dim rebuild-nightly.

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

58bf80c2

Feb 29, 2016

dim: do cherry-pick options -s -x -e by default · 7d77e635

Jani Nikula authored 9 years ago


Add signed-off-by and cross-reference, start editor to edit the commit
message.

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

7d77e635

Feb 19, 2016

dim: rename alias subcommand to list-aliases · 79c9d596

Jani Nikula authored 9 years ago


Also drop leading tab and fix underscores in output. Helper for bash
completion.

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

79c9d596

dim: add list-commands subcommand to list all subcommands · 5f6076c6
Jani Nikula authored 9 years ago
```
Helper for completion.

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

dim: add list-upstreams subcommand to list upstream branches · 38271c66

Jani Nikula authored 9 years ago


Helper for bash completion. The result depends on user's dim
configuration.

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

38271c66

dim: add list-branches subcommand to list nightly branches · 64cbc75a

Jani Nikula authored 9 years ago


Helper for bash completion. Where to get the information depends on
user's dim configuration.

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

64cbc75a

Admin message

Admin message