From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH] dim: Add status command
Date: Tue, 29 Nov 2016 15:31:44 +0100 [thread overview]
Message-ID: <20161129143144.5254-1-daniel.vetter@ffwll.ch> (raw)
Useful with our branch proliferation to make sure nothing is stuck (we
now also have drm-misc-next/-next-fixes/-fixes).
v2: Gracefully handle if some remotes arent' there.
Acked-by: seanpaul@chromium.org
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
dim | 22 ++++++++++++++++++++++
dim.rst | 5 +++++
2 files changed, 27 insertions(+)
diff --git a/dim b/dim
index 3dd2d1dec796..b21d1321af09 100755
--- a/dim
+++ b/dim
@@ -1285,6 +1285,28 @@ function dim_update_branches
update_rerere_cache
}
+function dim_status
+{
+ local repo remote drm_remote patches
+
+ cd $DIM_PREFIX/$DIM_DRM_INTEL
+
+ drm_remote=$(url_to_remote $drm_upstream_git)
+
+ for branch in $dim_branches ; do
+ repo=`branch_to_repo $branch`
+ if ! remote=`repo_to_remote $repo` ; then
+ continue
+ fi
+
+ patches=$(git log --oneline $remote/$branch ^origin/master ^$drm_remote/drm-next ^$drm_remote/drm-fixes | wc -l)
+
+ if [[ $patches -ne 0 ]] ; then
+ echo $repo/$branch: $patches unmerged patches
+ fi
+ done
+}
+
function setup_aux_checkout # name url directory
{
local name url dir remote
diff --git a/dim.rst b/dim.rst
index 9a045a43e7b7..0c52ab43e400 100644
--- a/dim.rst
+++ b/dim.rst
@@ -80,6 +80,11 @@ always maintained from the same machine, even if different branches are
maintained on different machines (by different maintainers), there's no need to
run this command.
+status
+------
+
+Lists all branches with unmerged patches, and how many patches are unmerged.
+
rebuild-tip
-----------
Rebuild and push the integration tree.
--
2.10.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2016-11-29 14:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-29 14:31 Daniel Vetter [this message]
2016-11-29 16:19 ` [PATCH] dim: Add status command Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161129143144.5254-1-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.