[PATCH] RFC: CONTRIBUTING: Embrace gitlab

. v2: Add link to merge request. v3: Remove all the westons (Daniel Stone). Cc: Daniel Stone Cc: Jani Nikula Cc: Sean Paul Cc: Rodrigo Vivi Cc: Lucas De Marchi Signed-off-by: Daniel Vetter --- CONTRIBUTING.rst | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) dif

Re: [PATCH] RFC: CONTRIBUTING: Embrace gitlab

On Wed, Sep 12, 2018 at 7:59 PM, Daniel Vetter wrote: > On Wed, Sep 12, 2018 at 7:54 PM, Ville Syrjälä > wrote: >> On Wed, Sep 12, 2018 at 06:46:57PM +0200, Daniel Vetter wrote: >>> So Rodrigo just broke the gitlab ci on libdrm, I figured perfect time >>

Re: [PATCH] RFC: CONTRIBUTING: Embrace gitlab

On Wed, Sep 12, 2018 at 9:33 PM, Rodrigo Vivi wrote: > On Wed, Sep 12, 2018 at 08:04:34PM +0200, Daniel Vetter wrote: >> On Wed, Sep 12, 2018 at 7:50 PM, Sean Paul wrote: >> > On Wed, Sep 12, 2018 at 1:34 PM Lucas De Marchi >> > wrote: >> >> >> &

Re: [PATCH] RFC: CONTRIBUTING: Embrace gitlab

On Wed, Sep 12, 2018 at 7:50 PM, Sean Paul wrote: > On Wed, Sep 12, 2018 at 1:34 PM Lucas De Marchi > wrote: >> >> On 09/12/2018 09:46 AM, Daniel Vetter wrote: >> > So Rodrigo just broke the gitlab ci on libdrm, I figured perfect time >> > to start this

Re: [PATCH] RFC: CONTRIBUTING: Embrace gitlab

On Wed, Sep 12, 2018 at 7:54 PM, Ville Syrjälä wrote: > On Wed, Sep 12, 2018 at 06:46:57PM +0200, Daniel Vetter wrote: >> So Rodrigo just broke the gitlab ci on libdrm, I figured perfect time >> to start this discussion. >> >> There's imo 2 reasons to do this: >

[PATCH] RFC: CONTRIBUTING: Embrace gitlab

st. v2: Add link to merge request. Cc: Jani Nikula Cc: Sean Paul Cc: Rodrigo Vivi Cc: Lucas De Marchi Signed-off-by: Daniel Vetter --- CONTRIBUTING.rst | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index c7846e318b7

Re: [PATCH] dim: Remove upgrade logic

On Wed, Sep 12, 2018 at 5:01 PM, Daniel Stone wrote: > On Wed, 12 Sep 2018 at 15:21, Daniel Vetter wrote: >> On Wed, Sep 12, 2018 at 4:01 PM, Daniel Stone wrote: >> > On Wed, 12 Sep 2018 at 14:53, Jani Nikula >> > wrote: >> >> On Wed, 12 Sep 2018, Dan

Re: [PATCH] dim: Remove upgrade logic

On Wed, Sep 12, 2018 at 4:01 PM, Daniel Stone wrote: > On Wed, 12 Sep 2018 at 14:53, Jani Nikula wrote: >> On Wed, 12 Sep 2018, Daniel Stone wrote: >> > On Wed, 12 Sep 2018 at 14:23, Jani Nikula >> > wrote: >> >> On Tue, 11 Sep 2018, Daniel Vetter wrote

Re: [PATCH] dim: Remove upgrade logic

On Wed, Sep 12, 2018 at 3:46 PM, Daniel Stone wrote: > On Wed, 12 Sep 2018 at 14:23, Jani Nikula wrote: >> On Tue, 11 Sep 2018, Daniel Vetter wrote: >> > No one seems to have screamed too badly, I guess we can push this? Can >> > I haz ack plz? >> >> Provi

Re: [PATCH] dim: Remove upgrade logic

On Thu, Aug 30, 2018 at 3:39 PM, Daniel Vetter wrote: > Of course I forgot the imporant part. > > Note: Never push this, or anything after it, to the old place in > drm-tip/maintainer-tools. > > Given our track record of forgetting a critical part in migrations I > think it

Re: [PATCH] doc: Add link to the gitlab pages

On Mon, Sep 03, 2018 at 10:47:02PM +0200, Daniel Vetter wrote: > Makes a lot easier to discover because unfortunately gitlab doesn't > have such a link built-in. > > Cc: Jani Nikula > Signed-off-by: Daniel Vetter Puhsed with Jani's irc ack. -Daniel > --- >

[PATCH] doc: Add link to the gitlab pages

Makes a lot easier to discover because unfortunately gitlab doesn't have such a link built-in. Cc: Jani Nikula Signed-off-by: Daniel Vetter --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index 89f7cbdebffd..1571a23b4857 100644 --- a/READM

Re: [PATCH] CI: switch to python3 by default

On Fri, Aug 31, 2018 at 08:33:33AM -0700, Lucas De Marchi wrote: > Signed-off-by: Lucas De Marchi Reviewed-by: Daniel Vetter > --- > .gitlab-ci.yml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index a23c324..9

[PATCH] dim: Remove upgrade logic

just a few wasted cpu cycles when running dim update-branches. Signed-off-by: Daniel Vetter --- dim | 8 1 file changed, 8 deletions(-) diff --git a/dim b/dim index a645c70a2005..f5deae8dc4dd 100755 --- a/dim +++ b/dim @@ -2032,14 +2032,6 @@ function dim_update_branches fi

[PATCH] dim: Migrate to Gitlab

te (Jani). Cc: Jani Nikula Cc: Rodrigo Vivi Cc: Daniel Stone Acked-by: Rodrigo Vivi (v2) Reviewed-by: Daniel Stone (v2) Reviewed-by: Sean Paul (v3) Signed-off-by: Daniel Vetter --- dim | 14 +- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 file

Re: [PATCH] build: make it compatible with python3 tools

the tools (and we prefer the one with -3 suffix if available). > While at it, also allow people to override RST2MAN in the command line > in case we have even more creative scenarios. > > Signed-off-by: Lucas De Marchi > --- > > Daniel, now it's green: > https://gitlab.freed

[PATCH] dim: Migrate to Gitlab

Sean Paul Cc: Rodrigo Vivi Cc: Daniel Stone Acked-by: Rodrigo Vivi (v2) Reviewed-by: Daniel Stone (v2) Signed-off-by: Daniel Vetter --- dim | 5 +++-- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dim

Re: [PATCH 1/2] dim: Migrate to Gitlab

On Wed, Aug 29, 2018 at 7:42 PM, Sean Paul wrote: > On Wed, Aug 29, 2018 at 01:40:26PM -0400, Sean Paul wrote: >> On Wed, Aug 29, 2018 at 07:32:26PM +0200, Daniel Vetter wrote: >> > On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote: >> > > On Wed, Aug 29, 2018 at 0

Re: [PATCH 1/2] dim: Migrate to Gitlab

On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote: > On Wed, Aug 29, 2018 at 05:25:24PM +0200, Daniel Vetter wrote: >> - Use the https url so we don't require everyone to have their gitlab >> accounts ready already. Otherwise we'd need to gate migrating >> mainta

[PATCH 2/2] doc: First attempt at CD

diusz Hiler Cc: Daniel Stone Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 12 dim.rst| 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9050d3eaf4e8..a23c324e1967 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@

[PATCH 1/2] dim: Migrate to Gitlab

ivi (v2) Reviewed-by: Daniel Stone (v2) Signed-off-by: Daniel Vetter --- dim | 12 +++- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dim b/dim index 3f5fdb9233f7..3612cc66d1c4 100755 --- a/dim ++

[PATCH] doc: First attempt at CD

d-off-by: Daniel Vetter --- .gitlab-ci.yml | 12 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9050d3eaf4e8..a23c324e1967 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,3 +7,15 @@ check: stage: build script: - make

Re: [PATCH] Migrate to Gitlab

On Tue, Aug 28, 2018 at 9:31 PM, Daniel Vetter wrote: > - Use the https url so we don't require everyone to have their gitlab > accounts ready already. Otherwise we'd need to gate migrating > maintainer-tools on migrating all the drm kernel repos, and I'd > r

Re: [PATCH] Add .gitlab-ci.yml

On Tue, Aug 28, 2018 at 9:49 PM, Lucas De Marchi wrote: > On Tue, Aug 28, 2018 at 12:01 PM Daniel Vetter wrote: >> >> This gives us neat little CI integration. No more "you have a >> different version of shellcheck" - we just pick the one everyone can >>

[PATCH] Migrate to Gitlab

1 match. For everything else we're going to migrate there will be a read-only copy with all urls working nicely, maintainer-tools is the only exception here. v2: Don't forget about dim_setup. Signed-off-by: Daniel Vetter --- dim | 12 +++- 1 file changed, 11 insertions(+

[PATCH] Add .gitlab-ci.yml

n fedora the python3 packages have a -3 suffix. Don't ask. Reviewed-by: Lucas De Marchi Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 9 + 1 file changed, 9 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode

Re: [PATCH v2] dim: Add dim rebase command

Changes in v2: > - s/validate_upstream_branch/validate_upstream_baseline/ (Daniel) > - Use check_conflicts instead of hand rolling (Daniel) > > Cc: Boris Brezillon > Cc: Daniel Vetter > Signed-off-by: Sean Paul Reviewed-by: Daniel Vetter > --- > dim | 42 +

[PATCH] Add .gitlab-ci.yml

archi Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 9 + 1 file changed, 9 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index ..382e3cf1442e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ +

Re: [PATCH] Add .gitlab-ci.yml

On Tue, Aug 28, 2018 at 8:04 PM, Lucas De Marchi wrote: > On Tue, Aug 28, 2018 at 10:24 AM Daniel Vetter wrote: >> >> This gives us neat little CI integration. No more "you have a >> different version of shellcheck" - we just pick the one everyone can >>

[PATCH] Add .gitlab-ci.yml

l, since if you do a fork and test there, gitlab CI will run stuff for you. Example: https://gitlab.freedesktop.org/danvet/maintainer-tools/blob/master/.gitlab-ci.yml Observe the awesome green checkmark in the top-left corner! Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 9

Re: [PATCH] dim: Add dim rebase command

> + branch=${1:?$usage} > + upstream=${2:?$usage} > + > + validate_upstream_branch $branch $upstream > + > + git rebase --signoff $upstream >& /dev/null || true > + if git diff | grep -q '\(<<<<<<<\|===\

[PATCH 2/2] Split out README.rst

-tools. But this should be good enough for now. Signed-off-by: Daniel Vetter --- README.rst | 16 index.rst | 16 +--- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 README.rst diff --git a/README.rst b/README.rst new file mode 100644 index

[PATCH 1/2] Split out CONTRIBUTING.rst

This way gitlab will automatically spot it and show it when people try to do a merge request or file an issue. Also shrink the title a bit, it looks terrible in the sidebar. Signed-off-by: Daniel Vetter --- CONTRIBUTING.rst | 11 +++ dim.rst | 12 index.rst

Re: [PATCH 3/3] dim: Move drm-intel-next specifics to its caller.

On Mon, Aug 27, 2018 at 09:12:59AM +0200, Daniel Vetter wrote: > On Fri, Aug 24, 2018 at 02:43:36PM -0700, Rodrigo Vivi wrote: > > By expanding the usage of new dim_pull_request_tags > > we can move the drm-intel-next specific parts to > > dim_pull_request_next and simplify

Re: [PATCH 3/3] dim: Move drm-intel-next specifics to its caller.

On Fri, Aug 24, 2018 at 02:43:36PM -0700, Rodrigo Vivi wrote: > By expanding the usage of new dim_pull_request_tags > we can move the drm-intel-next specific parts to > dim_pull_request_next and simplify the dim_pull_request > limiting it to only create the tags. > > Cc: Daniel

Re: [PATCH 2/3] dim: Introduce dim_request_pull_tags

ate > or with "-1", "-2", etc > > Suggested-by: Daniel Vetter > Cc: Daniel Vetter > Cc: Jani Nikula > Signed-off-by: Rodrigo Vivi > --- > dim | 45 + > dim.rst | 6 ++ > 2 files changed

Re: [PATCH 1/3] dim: Move special handling of drm-intel-next's repo to branch_to_repo

On Fri, Aug 24, 2018 at 02:43:34PM -0700, Rodrigo Vivi wrote: > I don't understand exactly why we need this special handling only > for drm-intel-next. But let's at least consolidate this into > branch_to_repo instead of spreading it around. > > Cc: Jani Nikula > Cc:

Re: [igt-dev] RFC: Migration to Gitlab

issions, issue tracking. We can choose&pick what we think is good, and ignore everything else. And of course if 1-2 years down the road things change, we can reevaluate. I think for a rough timeline if things go well we'll have igt and maintainer-tools migrated by end of year (just the repos, no

Re: [PATCH 2/2] dim: sanity-check config settings

On Wed, Aug 22, 2018 at 05:26:06PM -0700, Rodrigo Vivi wrote: > On Tue, Aug 21, 2018 at 02:08:19PM +0200, Daniel Vetter wrote: > > Shashank wanted to reuse his drm-tip repo for DIM_REPO, which doesn't > > work great. Catch this. > > > > Also group the various ch

Re: [igt-dev] RFC: Migration to Gitlab

On Wed, Aug 22, 2018 at 3:13 PM, Jani Nikula wrote: > On Wed, 22 Aug 2018, Daniel Vetter wrote: >> Hi all, >> >> I think it's time to brainstorm a bit about the gitlab migration. Basic >> reasons: >> >> - fd.o admins want to deprecate shell account

RFC: Migration to Gitlab

ess rights can be done at any level in the hierarchy, the organization is orthogonal to commit rights. - Anything else I've forgotten. A lot of this still needs to be figured out first. As a first step I'm looking for volunteers who want to join the fun, besides comments and thoughts on th

[PATCH 2/2] dim: sanity-check config settings

Shashank wanted to reuse his drm-tip repo for DIM_REPO, which doesn't work great. Catch this. Also group the various check functions all together for a bit of OCD. Cc: Shashank Sharma Signed-off-by: Daniel Vetter --- dim | 43 ++- 1 file change

[PATCH 1/2] dim: clarify dimrc a bit

Some notes I took while ramping up Shashank on dim. Aside: Requiring that DIM_REPO is already checked out seems to confuse too. Maybe we should just fall back to initializing an empty git repo - we'll all all the branches and remotes anyway. Cc: Shashank Sharma Signed-off-by: Daniel V

Re: [PATCH] dim: add From: tags for pull requests

On Tue, Aug 7, 2018 at 10:23 PM, Dave Airlie wrote: > On 8 August 2018 at 06:11, Daniel Vetter wrote: >> Requested by Dave Airlie, so that we automatically record the pull >> request submitter somewhere. After quick irc chat we decided to put it >> at the bottom, to avoid co

[PATCH] dim: add From: tags for pull requests

Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dim b/dim index 5ca4646ff685..a1c194318b56 100755 --- a/dim +++ b/dim @@ -945,7 +945,7 @@ function dim_apply_branch function dim_apply_pull { - local branch file

Re: [PATCH] dim: allow tags in backmerges

On Mon, Aug 6, 2018 at 10:16 PM, Dave Airlie wrote: > On 7 August 2018 at 06:11, Daniel Vetter wrote: >> Linus prefers that we backmerge a specific tag instead of a random >> point in his branch. Allow that. >> >> I guess it'd be nice to somehow figure out w

[PATCH] dim: allow tags in backmerges

v3: Make the check work from anywhere, we need to move the cd a bit up (Dave). Requested-by: Dave Airlie Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 7 +-- dim.rst | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dim b/dim index e477d043458b..5ca4646ff

[PATCH] dim: allow tags in backmerges

Requested-by: Dave Airlie Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 4 +++- dim.rst | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dim b/dim index e477d043458b..d4a1efc50d2a 100755 --- a/dim +++ b/dim @@ -1011,7 +1011,9 @@ function dim_backmerge

[PATCH] dim: allow tags in backmerges

ave Airlie Signed-off-by: Daniel Vetter --- dim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dim b/dim index e477d043458b..d4a1efc50d2a 100755 --- a/dim +++ b/dim @@ -1011,7 +1011,9 @@ function dim_backmerge upstream=${2:?$usage} if ! dim_list_upstreams

Re: [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time

On Thu, Jul 5, 2018 at 3:53 PM, Jani Nikula wrote: > On Wed, 27 Jun 2018, Daniel Vetter wrote: >> On Wed, Jun 27, 2018 at 5:13 PM, Jani Nikula wrote: >>> As a rule of thumb, don't change patches while committing. >>> >>> Cc: Imre Deak >>> Sign

Re: [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time

ace tweaks are acceptable. > + > On Confidence, Complexity, and Transparency > --- > > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/d

Re: [DIM DOCS PATCH 1/2] doc: update CI and pre-merge details in committer guidelines

x27;t track down to pre-existing&tracked issues please > don't > - push, but instead figure out what's going on. > +.. _patchwork: https://patchwork.freedesktop.org/project/intel-gfx/series/ > > Tooling > === > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools

Re: [PATCH v2] doc: clarify the target audience for the status command

in need of a pull request. Commiters that want to check the status of > their > +current branch should use normal **git status** commands. > + > + > pull-request *branch* *upstream* > > Fetch the *upstream* remote to make sure it's up-to

Re: [PATCH] dim: remove all mentions of drm-upstream

On Tue, Jun 19, 2018 at 01:12:00PM +0100, Daniel Stone wrote: > On Tue, 19 Jun 2018 at 13:08, Daniel Vetter wrote: > > The one case in dim_status is entirely unused. > > > > The usage in dim_setup seems still in use, but this is code for > > backwards compat hacks pred

Re: [PATCH] dim: Change drm-upstream remote to drm

On Tue, Jun 19, 2018 at 01:00:48PM +0100, Daniel Stone wrote: > Unbreak 'dim setup' and 'dim status' by noting the new repo name, as > configured in rerere config. > > Signed-off-by: Daniel Stone > Cc: Daniel Vetter Ugh. I restored the drm-upstream remote

[PATCH] dim: remove all mentions of drm-upstream

e drm-tip has all the right remotes nowadays, because that's all encoded in nightly.conf, and will be checked (if the remotes are missing) in dim_rebuild_tip. Reported-by: Daniel Stone Cc: Daniel Stone Signed-off-by: Daniel Vetter --- dim | 14 ++ 1 file changed, 2 inserti

Re: [PATCH 5/5] dim: Look up drm-next/fixes remotes

On Wed, May 23, 2018 at 9:27 AM, Daniel Vetter wrote: > ... instead of hard-coding them. Will allow us to move the drm > subsystem trees around without also having to update dim. Just a heads-up, I'm doing the nightly.conf book-keeping now to also move drm-fixes over. Hopefully shou

Re: [PULL] drm-intel-next

gging manageable sized batches > in dinq like Rodrigo has done here. So we're good. > > BR, > Jani. > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools

Re: [PULL] drm-intel-next

> Seems fair; this doesn't conflict with tagging manageable sized batches > in dinq like Rodrigo has done here. So we're good. The scripts don't require to send out a pull request when only tagging, I guess this pull here was just a fumble? -Daniel -- Daniel Vetter Software Eng

Re: [PATCH] dim: Look up drm-next/fixes remotes

On Thu, May 31, 2018 at 1:54 PM, Jani Nikula wrote: > On Wed, 30 May 2018, Daniel Vetter wrote: >> On Wed, May 30, 2018 at 09:44:24AM +0200, Daniel Vetter wrote: >>> ... instead of hard-coding them. Will allow us to move the drm >>> subsystem trees around withou

Re: [PATCH] qf: Add TODO

On Wed, May 30, 2018 at 6:24 PM, Rodrigo Vivi wrote: > On Wed, May 30, 2018 at 09:22:34AM -0700, Rodrigo Vivi wrote: >> On Wed, May 30, 2018 at 09:43:43AM +0200, Daniel Vetter wrote: >> > We have some documents floating around internally, imo better if we >> > track at

Re: [PATCH] dim: Look up drm-next/fixes remotes

On Wed, May 30, 2018 at 09:44:24AM +0200, Daniel Vetter wrote: > ... instead of hard-coding them. Will allow us to move the drm > subsystem trees around without also having to update dim. > > Inspired by a patch from Jani. > > I did test dim status and dim list-upstreams

[PATCH] dim: Look up drm-next/fixes remotes

maintainer, no longer). v2: Rebase, I had a patch in my local tree which isn't needed with this one here anymore. v3: Don't forget the drm-next branch name I accidentally dropped (Jani). Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 20 ++-- 1 file c

[PATCH] qf: Add TODO

We have some documents floating around internally, imo better if we track at least the simple ideas here ... v2: Alternative approach for getting rid of the patch rediffing noise. Cc: Lucas De Marchi Cc: Rodrigo Vivi Signed-off-by: Daniel Vetter --- qf | 8 1 file changed, 8

[PATCH] qf: Add TODO

We have some documents floating around internally, imo better if we track at least the simple ideas here ... Cc: Lucas De Marchi Cc: Rodrigo Vivi Signed-off-by: Daniel Vetter --- qf | 8 1 file changed, 8 insertions(+) diff --git a/qf b/qf index bffe9b753fa0..c606936c9c4c 100755

Re: [RFC] dim: Add warncheck subcommand

throughout. > >> + >> + # error will probably propagate, let's cut the noise >> +echo > > I'm not fond of superfluous whitespace in output. > >> +echo "Quitting early. Please fix and check the other commits as >> well." >>

Re: [PATCH 2/5] dim: Fix Link: checking regression

On Wed, May 23, 2018 at 02:23:01PM +0200, Daniel Vetter wrote: > On Wed, May 23, 2018 at 01:35:56PM +0300, Jani Nikula wrote: > > On Wed, 23 May 2018, Daniel Vetter wrote: > > > In > > > > > > commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73 > > > Auth

Re: [PATCH 5/5] dim: Look up drm-next/fixes remotes

On Wed, May 23, 2018 at 01:34:08PM +0300, Jani Nikula wrote: > On Wed, 23 May 2018, Daniel Vetter wrote: > > ... instead of hard-coding them. Will allow us to move the drm > > subsystem trees around without also having to update dim. > > > > Inspired by a patch from J

Re: [PATCH 3/5] dim: sanity checks for merges

On Wed, May 23, 2018 at 01:40:34PM +0300, Jani Nikula wrote: > On Wed, 23 May 2018, Daniel Vetter wrote: > > Just checks that merges aren't done without minimal thought. > > > > Cc: Jani Nikula > > Cc: Dave Airlie > > Signed-off-by

Re: [PATCH 2/5] dim: Fix Link: checking regression

On Wed, May 23, 2018 at 01:35:56PM +0300, Jani Nikula wrote: > On Wed, 23 May 2018, Daniel Vetter wrote: > > In > > > > commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73 > > Author: Daniel Vetter > > Date: Wed May 2 15:08:24 2018 +0200 > > > >

[PATCH 0/5 RESEND] various patches for the drm-next experiments

Hi all, I still have a bunch of patches from all the fine-tuning (plus one regression fix due to the already merged fine-tuning) for the drm-next experiments. Review and comments very much appreciated. Cheers, Daniel Daniel Vetter (5): dim: exclude commits from subordinate trees in pull

[PATCH 1/5] dim: exclude commits from subordinate trees in pull-request

ieves that. Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dim b/dim index 5308d07aee00..629fe1cb71be 100755 --- a/dim +++ b/dim @@ -1764,7 +1764,7 @@ function dim_update_next $DRY git add drivers/gpu/drm/i915/

[PATCH 5/5] dim: Look up drm-next/fixes remotes

maintainer, no longer). v2: Rebase, I had a patch in my local tree which isn't needed with this one here anymore. Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dim b/dim index dbd2c9a

[PATCH 2/5] dim: Fix Link: checking regression

In commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73 Author: Daniel Vetter Date: Wed May 2 15:08:24 2018 +0200 dim: check all commits in dim apply-pull and push-branch I broke the managed_branch logic which made sure we don't check for Link: tags for pulled branches (since external

[PATCH 4/5] dim: Make branch_to_remote more robust

change removes some of the implicit validation that the branch has a local tracking branch. I only spotted one place where an assert_branch was missing. Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dim b

[PATCH 3/5] dim: sanity checks for merges

Just checks that merges aren't done without minimal thought. Cc: Jani Nikula Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 22 ++ 1 file changed, 22 insertions(+) diff --git a/dim b/dim index 2fa158231228..ff9e572726cb 100755 --- a/dim +++ b/dim @@ -785,6 +7

[PATCH] dim: Make branch_to_remote more robust

change removes some of the implicit validation that the branch has a local tracking branch. I only spotted one place where an assert_branch was missing. Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dim b

Re: [PATCH 1/2] dim: Make branch_to_remote more robust

On Tue, May 22, 2018 at 1:41 PM, Jani Nikula wrote: > On Tue, 22 May 2018, Daniel Vetter wrote: >> The old version relied on branch@{upstream}, which requires that >> the branch is checked out. Instead use the indirection through the >> abstract drm-tip repo. > > IST

[PATCH 2/2] dim: Look up drm-next/fixes remotes

maintainer, no longer). Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dim b/dim index 118c446b87d5..4a8184ce2f80 100755 --- a/dim +++ b/dim @@ -1788,7 +1788,7 @@ function dim_update_next $DRY

[PATCH 1/2] dim: Make branch_to_remote more robust

The old version relied on branch@{upstream}, which requires that the branch is checked out. Instead use the indirection through the abstract drm-tip repo. Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dim b/dim

Re: [PATCH] dim: Don't fast-forward in apply-pull

On Fri, May 18, 2018 at 10:33 AM, Maarten Lankhorst wrote: > Op 18-05-18 om 09:31 schreef Daniel Vetter: >> Obvious oversight. >> >> Signed-off-by: Daniel Vetter >> --- >> dim | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> &g

[PATCH] dim: Don't fast-forward in apply-pull

Obvious oversight. Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index ddfb809fcc5c..33acacb24790 100755 --- a/dim +++ b/dim @@ -969,7 +969,7 @@ function dim_apply_pull checkpatch_commit_push_range 0 "

[PATCH 1/2] dim: Fix Link: checking regression

In commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73 Author: Daniel Vetter Date: Wed May 2 15:08:24 2018 +0200 dim: check all commits in dim apply-pull and push-branch I broke the managed_branch logic which made sure we don't check for Link: tags for pulled branches (since external

[PATCH 2/2] dim: sanity checks for merges

Just checks that merges aren't done without minimal thought. Cc: Jani Nikula Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 22 ++ 1 file changed, 22 insertions(+) diff --git a/dim b/dim index c3229fd72193..ddfb809fcc5c 100755 --- a/dim +++ b/dim @@ -785,6 +7

Re: [PULL] drm-intel-next

"... should _not_ take this as a personal failure ..." is what I meant of course. Worst possible oversight :-/ -Daniel On Tue, May 15, 2018 at 4:58 PM, Daniel Vetter wrote: > Imo we should take this as a personal failure of anyone, things > happen. Instead this is a good opport

Re: [PULL] drm-intel-next

; managing the pull request and maintenance, I need to learn more and improve > our working flow to prevent this happen in future. Sorry for the > inconvenience. > > Thanks, > Zhi. > > -Original Message- > From: Nikula, Jani > Sent: Tuesday, May 15, 2018 12:56 PM > T

Re: [PATCH] dim: check for empty pulls

On Tue, May 15, 2018 at 12:34 PM, Jani Nikula wrote: > On Tue, 15 May 2018, Daniel Vetter wrote: >> This could be a parsing error of the pull (for all the people who >> don't use a script like dim pull-request to make sure all the silly >> details are right), or some co

[PATCH] dim: check for empty pulls

This could be a parsing error of the pull (for all the people who don't use a script like dim pull-request to make sure all the silly details are right), or some confusion on the part of the sender, or something else. Either way not good to continue. Cc: Dave Airlie Signed-off-by: Daniel V

Re: [DIM PATCH 3/3] dim: Don't use --set-upstream

cd $DIM_PREFIX/drm-rerere > -- > Sean Paul, Software Engineer, Google / Chromium OS > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Software Engineer, Int

Re: [DIM PATCH v2] dim: Fix create-branch dry run

s is a special case maybe add a comment? # git push gives confusing error messages for non-existing # branches, even with --dry-run, hence the even quieter $DRY With that Reviewed-by: Daniel Vetter > + $DRY git push $remote +$branch --set-upstream > > cd $DIM_

Re: [DIM PATCH 1/3] dim: Remove superfluous assignment

On Mon, May 14, 2018 at 10:00:44AM -0400, Sean Paul wrote: > repo is re-assigned 2 lines lower :-) Reviewed-by: Daniel Vetter > > Signed-off-by: Sean Paul > --- > dim | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/dim b/dim > index 6b684ba5308c..7d87

Re: [PATCH] dim: Fix -d for apply-pull

On Mon, May 14, 2018 at 3:06 PM, Jani Nikula wrote: > On Mon, 14 May 2018, Daniel Vetter wrote: >> Lots of things we didn't mark up. Reported by Dave. >> >> Cc: Dave Airlie >> Signed-off-by: Daniel Vetter > > The dry run is a bit hit and miss, which ca

[PATCH] dim: Fix -d for apply-pull

Lots of things we didn't mark up. Reported by Dave. Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dim b/dim index 0c979a48bcd2..9ec43df08c4a 100755 --- a/dim +++ b/dim @@ -952,14 +952,14 @@ fun

Re: current dim master misapplies a pull

d detect whether the pull is for a dim-managed branch, and only check for Link: tags in that case. With dim -f apply-pull drm-next it all goes through smoothly. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [Intel-gfx] [PATCH] dim: replace pipe commands with single sed

2018 at 2:28 PM, Lucas De Marchi > wrote: > > A single sed can do the job of taking the second line after a match and > > it looks simpler. > > > > Signed-off-by: Lucas De Marchi > > --- > > > > I noticed this while reviewing "[PATCH 2/4] dim: s

Re: [PATCH 2/4] dim: shut up sed broken pipe noise in apply-pull

On Wed, May 09, 2018 at 11:10:18AM -0700, Lucas De Marchi wrote: > On Fri, May 4, 2018 at 12:04 AM, Daniel Vetter wrote: > > "head" immediately closes its stdin, which upsets sed. Shut it up. > > > > Cc: Dave Airlie > > Signed-off-by: Daniel Vetter > >

Re: [PATCH] dim: fix the repo for drm-next

gt; This fixes dim status and a bunch of pull request and other commands. > > Cc: Daniel Vetter > Signed-off-by: Jani Nikula > --- > dim | 16 ++-- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/dim b/dim > index 6b684ba5308c..a582

Re: [PATCH 5/5] dim: store Link: in MERGE_MSG in apply-pull

On Fri, May 04, 2018 at 05:13:23PM +0300, Jani Nikula wrote: > On Fri, 04 May 2018, Daniel Vetter wrote: > > This way there's no need for a dim apply-pull-continue, plain old git > > commit is enough. > > > > Aside: We might want to do the same trick for dim apply

Re: [PATCH 3/5] dim: shut up sed broken pipe noise in apply-pull

On Mon, May 7, 2018 at 9:14 AM, Jani Nikula wrote: > On Fri, 04 May 2018, Daniel Vetter wrote: >> On Fri, May 4, 2018 at 4:11 PM, Jani Nikula >> wrote: >>> On Fri, 04 May 2018, Daniel Vetter wrote: >>>> "head" immediately closes its stdin,

Re: [PATCH 2/5] dim: auto-commit in apply-pull if rerere solved it all

On Fri, May 4, 2018 at 9:39 PM, Dave Airlie wrote: > On 5 May 2018 at 00:10, Jani Nikula wrote: >> On Fri, 04 May 2018, Daniel Vetter wrote: >>> Now that we experiment with dim for drm-next it's much more likely >>> that pull requests have conflicts. But also

<    1   2   3   4   5   >