Skip to content
Snippets Groups Projects
Select Git revision
0 results
Search by author
  • Any Author
0 authors
  1. Nov 16, 2016
    • Simona Vetter's avatar
      dim: autodetect branches in rebuild-nightly · b58b3b8b
      Simona Vetter authored 
      
Needs new url-mapping information in nightly.conf to work properly. Only
leftover bit from my original patch after rebasing is to abstract away
the remote for the integration tree.

v2:
- Fix typo when calling rr_cache_dir. Oops.
- Use cut -f 1 instead of sed/regex horrors (jani).

v3: Fix bug that resulted in nesting rr-cache directories.

v4: Rebasing.

v5: Resurrect $repo (as $remote) printing when fetching branches,
originally from my patch.

v6: Use remote instead of origin local variables, to be more
consistent. Picked up from Jani.

v7: Move misplaced hunks to right place.

v8: For the nightly remote use nightly_remote instead of anything
called origin - it's confusing.

v9: Create a separate rerere_remote for the rerere-cache branch. It
might be in a difference local git repository (Jani).

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      b58b3b8b
  3. Nov 15, 2016
    • Simona Vetter's avatar
      dim: autodetect branches in rebuild-nightly · aa806bd9
      Simona Vetter authored 
      
Needs new url-mapping information in nightly.conf to work properly. Only
leftover bit from my original patch after rebasing is to abstract away
the remote for the integration tree.

v2:
- Fix typo when calling rr_cache_dir. Oops.
- Use cut -f 1 instead of sed/regex horrors (jani).

v3: Fix bug that resulted in nesting rr-cache directories.

v4: Rebasing.

v5: Resurrect $repo (as $remote) printing when fetching branches,
originally from my patch.

v6: Use remote instead of origin local variables, to be more
consistent. Picked up from Jani.

v7: Move misplaced hunks to right place.

v8: For the nightly remote use nightly_remote instead of anything
called origin - it's confusing.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      aa806bd9
    • Simona Vetter's avatar
      dim: support git worktree for aux checkouts · f33ee9b1
      Simona Vetter authored 
      
If available by default. This saves quite a pile of disk-space that
imo making it the default is justified.

Note that this will break the rebuild-nightly script for now,
follow-up patches will fix that.

v2: Rebase to put the dim rework at the end of the series.

v3: s/remote_url/url/

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      f33ee9b1
    • Simona Vetter's avatar
      dim: autodetect remotes, first part for dim_setup · 11d99d9d
      Simona Vetter authored 
      
The goals here are multiple:
- simpler configuration through autodetection
- allows seamless upgrading to git worktree for the aux checkouts
- eventually I want to split up drm-misc into a separate remote ...

And yes this is just a start.

v2: Print errors to stderr, otherwise they can't be seen when directly
assigning the result of get_remote_name to a variable.

v3: Rebased to pull the cleanup patches ahead of the dim rework.

v4: Rebase to put the dim rework at the end of the series.

v5: s/get_remote_name/url_to_remote/ to align with Jani.

v6: s/remote_url/url/ plus add a variable naming convention.

v7: Move the naming convention next to the foo_to_bar mapping
functions.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      11d99d9d
  5. Nov 10, 2016
  7. Nov 08, 2016
    • Jani Nikula's avatar
      dim: switch to using remote agnostic integration branch config · 12976ee3
      Jani Nikula authored 
      
NOTE: This change depends on the nightly.conf commit 0d0e6d4e7dcc
("nightly.conf: prepare for remote agnostic configuration") in the
rerere-cache branch of the drm-intel repo. Looking at that first makes
this change more sensible.

Use two arrays to configure the repos and branches to be merged to the
integration branch:

drm_tip_repos

	An associative array that maps repo names to urls. This is
	mostly a convenience for defining the other array. The repo
	names are symbolic, and not related to actual git remote names.
	It's also helpful for implementing dim create-branch and
	remove-branch.

drm_tip_config

	An array of strings which describes the repos and branches to be
	used to generate the integration branch. The repos are listed
	using the symbolic repo names from the drm_tip_repos array. It's
	also possible to list an override sha, in case there's a need to
	hold back updating to the tip of the branch for some reason.

dim as a whole still remains dependent on specific (and configured)
remote names, but this change detaches nightly.conf from the remote
names.

Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      12976ee3
    • Jani Nikula's avatar
      dim: add a variable for nightly.conf · 2e182dee
      Jani Nikula authored 
      
We'll change the name at some point, add some indirection, with a
generic variable name.

Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      2e182dee
  9. Oct 28, 2016
  11. Oct 27, 2016
  13. Oct 26, 2016
  15. Oct 11, 2016
  17. Sep 30, 2016
  19. Sep 26, 2016
  21. Sep 23, 2016
  23. Aug 29, 2016
  25. Aug 23, 2016
  27. Jul 20, 2016
  29. Jul 19, 2016
  31. Jul 11, 2016
  33. May 10, 2016
  35. Apr 20, 2016
  37. Apr 19, 2016
  39. Mar 30, 2016