[dim PATCH 2/7] dim: stop generating drm-intel-testing requests
Since the drm-intel-testing branch was introduced, we've completely
shifted from testing pull requests to pre-merge patch testing and
continuous testing. The drm-intel-testing branch and testing request has
outlived its usefulness. Remove it.
We still leave the workflow for tagging and making pull requests as they
are for now.
Signed-off-by: Jani Nikula
---
dim | 52
dim.rst | 9 ++---
2 files changed, 6 insertions(+), 55 deletions(-)
diff --git a/dim b/dim
index 8187f8894c8f..8e782eecff70 100755
--- a/dim
+++ b/dim
@@ -94,15 +94,6 @@ dim_pull_request_recipients=(
"Dave Airlie "
)
-# Recipients for drm-intel-testing updates.
-dim_test_request_recipients=(
- -c "Jani Nikula "
- -c "Joonas Lahtinen "
- -c "Rodrigo Vivi "
- -c "intel-...@lists.freedesktop.org"
- "Jari Tahvanainen "
-)
-
# integration configuration
dim_integration_config=nightly.conf
@@ -1860,23 +1851,9 @@ function dim_update_driver_date
function dim_update_next
{
- local remote
-
assert_branch drm-intel-next-queued
- remote=$(repo_to_remote drm-tip)
-
git pull --ff-only
- git fetch drm-tip
-
- if ! git branch --merged $remote/drm-tip | grep -q drm-intel-fixes ;
then
- echo "drm-intel-fixes not merged into drm-tip, please update!"
- exit 2
- fi
- if ! git branch --merged $remote/drm-tip | grep -q
drm-intel-next-queued ; then
- echo "drm-intel-next-queued not merged into drm-tip, please
update!"
- exit 2
- fi
dim_update_driver_date "drm/i915" "drivers/gpu/drm/i915/i915_drv.h"
@@ -1890,38 +1867,17 @@ function dim_update_next
function dim_update_next_continue
{
- local remote intel_remote req_file tag tag_testing
+ local remote tag
assert_branch drm-intel-next-queued
- intel_remote=$(repo_to_remote drm-intel)
- remote=$(repo_to_remote drm-tip)
+ remote=$(repo_to_remote drm-intel)
- git push $DRY_RUN -f $intel_remote drm-intel-next-queued:drm-intel-next
+ git push $DRY_RUN -f $remote drm-intel-next-queued:drm-intel-next
tag=$(tag_name "drm-intel-next")
- tag_testing="${tag/next/testing}"
tag_branch $tag drm-intel-next
- git push $DRY_RUN $intel_remote $tag
-
- echo "Updating drm-intel-testing to latest drm-tip"
- git push $DRY_RUN $intel_remote +$remote/drm-tip:drm-intel-testing
- $DRY git tag $tag_testing $intel_remote/drm-intel-testing
- $DRY git push $intel_remote $tag_testing
-
- req_file=$(mktemp)
- cat > $req_file <<-HERE
- Hi all,
-
- The following changes tagged $tag_testing:
-
- HERE
-
- prep_pull_mail_overview "$tag" >> $req_file
- prep_pull_mail_signature >> $req_file
-
- $DRY $DIM_MUA -s "Updated drm-intel-testing" \
--i $req_file "${dim_test_request_recipients[@]}"
+ git push $DRY_RUN $remote $tag
}
function dim_tag_branch
diff --git a/dim.rst b/dim.rst
index 2a0deedb6ba1..7aa90e659983 100644
--- a/dim.rst
+++ b/dim.rst
@@ -362,13 +362,8 @@ should be preferred.
update-next
---
-Pushes out the latest dinq to drm-intel-next and tags it. Also
-pushes out the latest drm-tip to drm-intel-testing. For an
-overview a gitk view of the currently unmerged feature pile is
-opened.
-
-Also checks that the drm-intel-fixes|-next-queued are fully
-merged into drm-tip to avoid operator error.
+Pushes out the latest dinq to drm-intel-next and tags it. For an overview a
gitk
+view of the currently unmerged feature pile is opened.
The tag will be signed using the key specified by \$DIM_GPG_KEYID, if set.
--
2.11.0
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[dim PATCH 1/7] dim: abstract driver date update to a subcommand
Abstract the driver date update to a function of its own. Make it useful
for other drivers as well in case they ever need it.
Signed-off-by: Jani Nikula
---
dim | 24 ++--
dim.rst | 5 +
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/dim b/dim
index 3d6548568b56..8187f8894c8f 100755
--- a/dim
+++ b/dim
@@ -1841,6 +1841,23 @@ function tag_branch
$DRY git tag -a $DIM_GPG_KEYID -f $tag
}
+# $1: commit subject prefix
+# $2: file
+function dim_update_driver_date
+{
+ local prefix file driver_date driver_timestamp
+
+ prefix=${1:?$usage}
+ file=${2:?$usage}
+
+ driver_date=$(date +%Y%m%d)
+ driver_timestamp=$(date +%s)
+
+ $DRY sed -i -e "s/^#define DRIVER_DATE.*\"[0-9]*\"$/#define
DRIVER_DATE\t\t\"$driver_date\"/; s/^#define DRIVER_TIMESTAMP.*/#define
DRIVER_TIMESTAMP\t$driver_timestamp/" "$file"
+ $DRY git add "$file"
+ git commit $DRY_RUN -sm "$prefix: Update DRIVER_DATE to $driver_date"
+}
+
function dim_update_next
{
local remote
@@ -1861,12 +1878,7 @@ function dim_update_next
exit 2
fi
- driver_date=$(date +%Y%m%d)
- driver_timestamp=$(date +%s)
- $DRY sed -i -e "s/^#define DRIVER_DATE.*\"[0-9]*\"$/#define
DRIVER_DATE\t\t\"$driver_date\"/; s/^#define DRIVER_TIMESTAMP.*/#define
DRIVER_TIMESTAMP\t$driver_timestamp/" \
-drivers/gpu/drm/i915/i915_drv.h
- $DRY git add drivers/gpu/drm/i915/i915_drv.h
- git commit $DRY_RUN -sm "drm/i915: Update DRIVER_DATE to $driver_date"
+ dim_update_driver_date "drm/i915" "drivers/gpu/drm/i915/i915_drv.h"
gitk --first-parent drm-intel-next-queued ^$(branch_to_remote
drm-next)/drm-next &
diff --git a/dim.rst b/dim.rst
index 5a093b03c24a..2a0deedb6ba1 100644
--- a/dim.rst
+++ b/dim.rst
@@ -274,6 +274,11 @@ for-each-workdir *command*
Run the given command in all active workdirs including the main linux kernel
repository under \$DIM_REPO.
+update-driver-date *prefix* *file*
+--
+Update the the DRIVER_DATE and DRIVER_TIMESTAMP macros in *file* to match
+current date and time, and commit the change using given subject prefix.
+
COMMANDS FOR MAINTAINERS
--
2.11.0
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[dim PATCH 5/7] dim: optionally launch gitk with changelog on dim tag-branch
Similar to what pull-request currently does. Try to be clever about not
including all unmerged changes, just the ones that haven't been tagged
yet.
Signed-off-by: Jani Nikula
---
dim | 15 +--
dim.rst | 6 --
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/dim b/dim
index e0f96f78c858..5081e9ac4a34 100755
--- a/dim
+++ b/dim
@@ -1898,9 +1898,10 @@ function dim_update_next_continue
function dim_tag_branch
{
- local branch remote tag
+ local branch upstream remote tag unmerged_tags
- branch=$1
+ branch=${1:?$usage}
+ upstream=$2
assert_branch $branch
remote=$(branch_to_remote $branch)
@@ -1915,6 +1916,16 @@ function dim_tag_branch
echo "Tagging current $branch"
+ if [[ -n "$upstream" ]]; then
+ # If there are unmerged tags, show changes since last
+ unmerged_tags=$(git_unmerged_tags "$branch" "$upstream")
+ if [[ -n "$unmerged_tags" ]]; then
+ upstream="${unmerged_tags%% *}"
+ fi
+
+ gitk --first-parent "$branch" "^$upstream" &
+ fi
+
tag=$(tag_name "$branch")
tag_branch $tag $branch
git push $DRY_RUN $remote $tag
diff --git a/dim.rst b/dim.rst
index 7aa90e659983..792c99f324fa 100644
--- a/dim.rst
+++ b/dim.rst
@@ -374,13 +374,15 @@ When **update-next** fails to push the special release
commit (because it raced
another committer) rebase and push manually, and then continue using this
command.
-tag-branch *branch*
+tag-branch *branch* [*upstream*]
+
Pushes a new tag for the specified branch after checking that the remote is
up-to-date.
The tag will be signed using the key specified by \$DIM_GPG_KEYID, if set.
+If upstream is provided, launch gitk to show the changes to be tagged.
+
tag-next
**tag-branch** shorthand for drm-intel-next.
--
2.11.0
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[dim PATCH 0/7] dim: tagging and pull request changes, begin dinq/din migration
Hi all, there's two main themes here, intertwined because it's hard to properly separate the two: * Start encouraging separate dim tag-branch and dim pull-request. It's not a requirement (yet) but start supporting it better. First, make tag-branch show changes since last tag or upstream. Second, make pull-request take all of the previous tags into account. The future development here would be to *not* unconditionally tag in pull-request. * Start migrating away from the split drm-intel-next-queued and drm-intel-next model. Remove the drm-intel-testing step. First we move towards using drm-intel-next-queued exclusively. The future development here would be to add drm-intel-next to nightly.conf followed by a potential flag day switch from drm-intel-next-queued to drm-intel-next. All of the patches here should be incremental. No need to apply all at once. That might be a good option, since dim is pretty hard to test, so I've mostly tested bits and pieces out of context. BR, Jani. Jani Nikula (7): dim: abstract driver date update to a subcommand dim: stop generating drm-intel-testing requests dim: return early on tag-branch fail dim: abstract helper for listing unmerged tags dim: optionally launch gitk with changelog on dim tag-branch dim: include all unmerged tags in the pull request mail dim: replace drm-intel-next usage with drm-intel-next-queued dim | 169 dim.rst | 33 + 2 files changed, 86 insertions(+), 116 deletions(-) -- 2.11.0 ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
[dim PATCH 3/7] dim: return early on tag-branch fail
Reduce indent on the happy day scenario. Update error logging while at
it.
Signed-off-by: Jani Nikula
---
dim | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dim b/dim
index 8e782eecff70..b227f0db99dc 100755
--- a/dim
+++ b/dim
@@ -1892,16 +1892,16 @@ function dim_tag_branch
git fetch $remote
- if [ $(git rev-parse $branch) == $(git rev-parse "$branch@{u}") ] ; then
- echo "Tagging current $branch"
-
- tag=$(tag_name "$branch")
- tag_branch $tag $branch
- git push $DRY_RUN $remote $tag
- else
- echo "$branch not up-to-date, aborting"
- exit
+ if [ $(git rev-parse $branch) != $(git rev-parse "$branch@{u}") ]; then
+ echoerr "ERROR: $branch not up-to-date"
+ return 1
fi
+
+ echo "Tagging current $branch"
+
+ tag=$(tag_name "$branch")
+ tag_branch $tag $branch
+ git push $DRY_RUN $remote $tag
}
function dim_tag_next
--
2.11.0
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
[PULL] drm-misc-fixes
Hi Dave, drm-misc fixes for this week. Big item is the lease uevent change. It seems like there's a high degree of confidence that existing userspaces will be happy with any uevent, so it should be a non-issue. Nevertheless, it hasn't soaked for very long, so something to keep an eye on. drm-misc-fixes-2018-12-05: UAPI: - Distinguish lease events from hotplug (Daniel) Other: - omap: Restore panel-dpi bus flags (Tomi) - omap: Fix a couple of dsi issues (Sebastian) Cc: Sebastian Reichel Cc: Tomi Valkeinen Cc: Daniel Vetter Cheers, Sean The following changes since commit 9765635b30756eb74e05e260ac812659c296cd28: Revert "drm/dp_mst: Skip validating ports during destruction, just ref" (2018-11-28 16:22:17 -0500) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2018-12-05 for you to fetch changes up to b31a3ca745a4a47ba63208d37cd50abffe58280f: drm/fb-helper: Fix typo in parameter description (2018-12-04 14:22:20 +0100) UAPI: - Distinguish lease events from hotplug (Daniel) Other: - omap: Restore panel-dpi bus flags (Tomi) - omap: Fix a couple of dsi issues (Sebastian) Cc: Sebastian Reichel Cc: Tomi Valkeinen Cc: Daniel Vetter Daniel Vetter (1): drm/lease: Send a distinct uevent Sandeep Panda (1): drm/bridge: fix AUX_CMD_SEND bit value for ti, sn65dsi86 bridge Sebastian Reichel (2): drm/omap: populate DSI platform bus earlier drm/omap: fix incorrect union usage Tomi Valkeinen (1): drm/omap: fix bus_flags for panel-dpi Wei Yongjun (1): drm/fb-helper: Fix typo in parameter description drivers/gpu/drm/bridge/ti-sn65dsi86.c| 2 +- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_internal.h | 2 + drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 10 + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 1 + drivers/gpu/drm/omapdrm/dss/dsi.c| 20 +- drivers/gpu/drm/omapdrm/dss/omapdss.h| 2 +- drivers/gpu/drm/omapdrm/omap_encoder.c | 58 9 files changed, 60 insertions(+), 39 deletions(-) -- Sean Paul, Software Engineer, Google / Chromium OS ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
