Chris ran into this, and I guess worth documenting best practices
since it happens sooooooo rarely.

v2: Clarify stuff a bit.

v3: Also normalize branch names in conflict markers. Without this we
can't use fixup patches to fixup up conflicts when git rerere fails to
store/reapply the resolution.

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

Avoids sprawnling branches everywhere, and makes the script faster for
folks who don't need everything. We already skip remotes, so this is
in line with what's there.

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

And roll it out.

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

And use it everywhere. Found a few more places that don't use the
usual style.

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

Maybe there's only a read-only remote available, and with the
drm-misc/-intel split that's perfectly fine.

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

Laurent got mightily confused about this, and assumed he's getting
volunteered as an intel maintainer because dim asks for an intel
remote.

With the branch autodetection we can postpone all the remote checks to
when we need them. This is similar to the changes to update-branches
to only update branches that exist, but for remotes.

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

- Remove branch overview, instead link to drm-intel and drm-misc
  pages.

- Move quickstart to the top, to make it easier to find.

- Make quickstart generic, we use dim for other stuff than drm-intel
  now.

- s/drm-intel-rerere/drm-rerere/

- Remove the section about resolving conflicts, that's now explained
  in detail in the process pages.

v2: Also eradicate dinq (Laurent).

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

Set $remote before using it.

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

Old versions of git fetch exited with 128 when there was nothing to
fetch. But ignoring all return values is bad as Chris recently found
out, since then rebuilding drm-tip might go back to older branch
versions if the fetch fails for some reason.

I also noticed that current git (I have 2.11 here) don't exhibit this
anymore.

v2: s/exit/return/ to give callers a chance to do something with this.
We use set -e, so same result (Jani).

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

It's been years since drm-intel had only one maintainer, and the
primary use-case for dim ub was only to sync between machines. Update
the docs to reflect this, to avoid misleading committers. Also update
the maintainer-tools branch, which is something Paulo's script also
does.

Motivated because Paulo typed an actualize.sh script which does
exactly what dim ub is meant to do.

v2: Also update quickstart guide.

v3: And spelling fixes.

v4: Fix title and only update maintainer-tools when not a private
branch is checkout out (Jani).

Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

When a branch can be fast-forwarded, try it first before rebasing.
This will prevent a whole lot of editor windows opening with 'noop'
when running dim ub.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>

We insert the tag right below, and recent git versions started to
strongly suggested that tags should read like commit messages, i.e.
summary, blank line, extended content. That means I don't need a
heading of my own to make it look spiffy.

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

Without this, my non-git-worktree setup will fail to push (or it takes
forever) if the local drm-tip is not up to date.

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

Fixes: 6552af2d ("dim: fix update-branches to fetch all available nightly repos")
Cc: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

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>

Update all nightly repos that have a corresponding local remote.

Cc: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

I don't have user.email set, and instead rely on git's fallback to
EMAIL. Implement that. Couldn't apply patches anymore without this.

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

No need to read the config etc. twice. Add a check to prevent us from
adding new ones.

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

Noticed by Ville.

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

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

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

'dim list-upstreams' is needed by bash completion and is used outside of
git repos, also within git repos without drm upstream, so don't fail if
it can be avoided.

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

This lets us handle url_to_remote failures gracefully where they're not
fatal. Our use of 'set -e' guarantees this will bail out otherwise.

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

We rely on 'set -e' to bail out on errors. We also do a lot of local
variable assignments with command substitution like this:

	local foo=$(bar)

However, that masks the return value of the command, failing to bail out
on errors. Split up local variable declarations from assignments to
avoid the problems.

There are no issues with literal assignments like

	local foo="bar"

but split those out too for more uniform code, preferring to have local
declarations in the beginning of functions or nested blocks.

Details at
http://stackoverflow.com/questions/4421257/why-does-local-sweep-the-return-code-of-a-command



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

Reference drm-tip, use $integration_config, or just drop old/stale
comments.

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

Keep update-branches as an alias.

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

Noticed by Archit, but probably a good idea in general.

v2: Fetch before printing (Jani). While at it make them all less
noisy, it's kinda confusing to have random git output interleaved with
dim messages.

v3: Don't silence stderr (Jani)

v4: Use git fetch -q (Abdiel).

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

Stuff Summit and Sean noticed while testing the new dim:
- Run git fetch in setup to make sure we can create tracking branches.
- Don't fall over the lack of .git/rr-cache.
- Handle drm-intel-next specially in dim checkout since it's a dim
  branch, but not included in drm-tip.

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

Gustovo asked whether there's docs for drm-misc, so took the
opportunity to flesh out the very sparse existing write-up. Also
adjust it to reality, since we've started to take some pretty big
features in through drm-misc (like explicit fencing for atomic).

v2: Be more clear on scope of drm-misc (Jani).

Acked-by:  <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

I never knew this even was a thing, and plain git am cuts everything
below the scissors line (since it matches the --- of a diffstat
start).

Cc: Robert Bragg <robert@sixbynine.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

- dim update-branches was entirely broken, fix it.
- dim checkout's auto-branch-create mode needs to pick the right
  remote
- check for drm-tip remote only in the drm-nightly repo (in case of
  git without worktree support).

v2: Also run git fetch $remote in dim_checkout when creating a new
branch, to avoid uncompresible error message when the branch (or the
remote name) is super-new.

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

If DIM_DRM_INTEL has .. in it (i.e. relative path) not everything
worked as expected, this fixes it. Allows you to use an existing git
checkout, while stashing all the dim stuff into some subdir somewhere
out of sight.

v2: Fixup paths. Oops.

v3: Fixup misplace hunk from rebasing.

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

I had a bug in dim for short while which resulted in the rr-cache dir
getting copied into itself recursively, each time dim rebuild-nightly
was run. I fixed that, but unfortunately it spread to the real repo
already, and a bunch of folks have it in their local checkout.

Stop this infection from spreading by explicitly deleting the
recursive rr-cache dir.

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

With the automatic remote lookup this is no longer needed.

v2: Wrap strings in "" (Jani).

v3: Rebasing, yay!

v4: Fixup rebase fallout and bugs I've spotted.

v5: s/remote_url/url/

v6: Remove get_remote_name, now superseeded by url_to_remote.

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

With the remotes stored in nightly.conf and git worktrees we can avoid
hard-coding them in even more places.

v2: Rebase.

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

- Only update the for-linux-next branches in the repo for the branch
  just pushed.
- Roll out the same logic (to allow us to always merge feature
  patches) for drm-misc.

v2: Bikesheds, bikesheds ... oh dear is this going to be fun to
re-test and then re-re-rebase out all the bugfixes in the right places
again.

v3: Fixup fallout - get_remote_for_branch wasn't working correctly.

v4: Don't use the nightly_ prefix, this is not about the integration
tree. Also sprinkle local annotations for the other read variables.

v5: s/map_nightly_remote/repo_to_remote/ to align with url_to_remote.

v6: s/get_nightly_repo_for_branch/branch_to_repo/ to align with
url_to_remote.  Also move next to url_to_remote.

v7: Split out branch_to_repo, already needed in an earlier patch.

v8: Really try to get rid of rebase fail, somehow a nightly_origin
got resurrected!

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

Looking up the remote for deleting the branch is a bit an exercise.

v2: Correctly keep the fake remote name from nightly.conf and the real
(local) remote name apart.

v3: More untested rebasing. This removes the FIXME comments and compat
code from Jani, since these two functions should work now properly.

v4: Now tested, and with fallout fixed - map_nightly_remote was
was missing, and also accidently left some old garbage in.

v5: s/map_nightly_remote/repo_to_remote/ to align with url_to_remote.
Also move next to url_to_remote.

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

This first patch just handles push and pull-request. Since the code
now auto-transfroms ssh:// git urls to git:// urls we can remove
$drm_intel_git.

Still left to do is fixing up create-branch and remove-branch.
Everything else should work here now.

v2: Rebase&fixup fallout.

v3: Squash in follow-up patch to rectify pull-request more.

v4: Also make it work properly again for drm-intel-next (which is not
in $integration_configuration and hence a special case again).

v5: s/get_remote_for_branch/branch_to_remote/ to align with
url_to_remote.  Also move next to url_to_remote.

v6: Move branch_to_repo to the right patch.

v7: Split out branch_to_remote, needed in an earlier patch.

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

Much shorter and less ugly than &> /dev/null. Suggested by Jani.

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

This is a prep step to eventually split out the drm-misc branches all
into their own repo. To get there we first need to split out the
integration tree mangling.

Since dim doesn't auto-update and since the transition is a good
reason to switch over to worktrees and it's tricky it's not scripted.
The following needs to be done when dim rebuild-nightly fails:

- Make sure you have the latest dim version.

- Good to also check you have a recent-ish git. Latest dim supports
  git worktree to save on disk space needed for .git metadata. It's
  much more robust than the git alternates storage trick we've used
  thus far. Note that git worktree is still optional (but that's not a
  recommended setup).

- Delete $DIM_PREFIX/{drm-intel-rerere,drm-intel-nightly,maintainer-tools}
  It's not strictly needed to kill the maintainer-tools checkout too,
  but might as well switch it over to git worktree too.

- Make sure you don't have any branches left over for drm-intel-rerere
  and drm-intel-nightly anywhere (since they need to switch their
  remotes).

- run dim setup and enjoy the new awesomeness.

If it breaks, I'm guilty ;-)

v2: don't call get_remote_name before switching directories.

v3: Rebase prep patches to be at the start of the series, which also
allows this patch to be squashed together with the one that renames
-nightly to -tip.

v4: Jumping over bikesheds.

v5: One more jump in read_integration_config.

v6: Use remote instead of origin in local variables, picked up from
Jani.

v7: Split out misplaced hunk.

v8: s/nightly_remote/remote, nightly_ should be only used for the
integration branch remotes. While at it also use grep -q instead of &>
/dev/null

v9: With nightly_remote free use that to denote the drm-tip remote in
rebuild-nightly.

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