Skip to content

Commit

Permalink
Backport PR #7724
Browse files Browse the repository at this point in the history 
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z

-------------------------------
**Backported based on diff from PR #7779**
  • Loading branch information
@elastic-jasper
elastic-jasper committed Jul 21, 2016
1 parent ba4bd84 commit f8245c0
Show file tree
Hide file tree
Showing 5 changed files with 228 additions and 0 deletions.
83 changes: 83 additions & 0 deletions backport--instructions.rej
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
Backport of PR #7790 to branch 4.3 failed

https://github.com/elastic/kibana/pull/7790


- 1 patch failed to apply
- 5 patches were applied successfully

-------------------------------------

At this point, you need to manually resolve these conflicts on your machine and
push the changes back up to this upstream branch so the PR is updated with your
changes. The following instructions and scripts should help with that.

All of the provided scripts assume that the remote "upstream" is where the
backport branch exists and that your local branch has the exact same name as
the upstream branch.

First, check out this branch locally:

git fetch upstream jasper/backport/7724/7790/4.3
git checkout jasper/backport/7724/7790/4.3

Now, just follow one of these two paths:


1. GUIDED BACKPORT

You should do the guided backport if you want to apply the backported changes
while resolving the conflicts on each commit. For most cases, this is what you
want to do.

The following script will rebase the commits that need to be backported onto
a new temporary branch. Resolve any conflicts as you normally would during a
rebase. Do not remove these backport-*.rej files, and feel free to add
additional commits if that's necessary:

sh backport-guided-begin.rej

Once the conficts are resolved and the rebase is completed, the following
script will update the local backport branch with the changes, remove the
temporary branch that was created, remove the remnants of this backport commit
and squash the newly resolved commits (and any others you may have added) into
a single backport commit with the proper commit message:

sh backport-guided-finish.rej

At this point, you should be on the local backport branch, and it should be
exactly 1 commit ahead of the intended target. The commit message should be
very similar if not identical to the PR itself, and the changeset should
include all of the changes you intended to backport and none of these
backport-*.rej files.

Now just replace the contents of the pull request with your local changes:

git push -f upstream jasper/backport/7724/7790/4.3


2. ALMOST COMPLETELY MANUAL

You should do this option if there are just so many conflicts that it's easier
to rebuild the entire changeset from scratch. You'll still work on the local
backport branch which should be up to date with the intended target.

Feel free to add as many commits as you'd like and don't worry about fancy
commit messages - we're just going to squash them down and replace the message
when you're finished.

Once the changes are committed on your local backport branch, the following
script will remove the remnants of this backport commit and squash the newly
created commits into a single backport commit with the proper commit message.

sh backport-wrangle-into-commit.rej

At this point, you should be on the local backport branch, and it should be
exactly 1 commit ahead of the intended target. The commit message should be
very similar if not identical to the PR itself, and the changeset should
include all of the changes you intended to backport and none of these
backport-*.rej files.

Now just replace the contents of the pull request with your local changes:

git push -f upstream jasper/backport/7724/7790/4.3
111 changes: 111 additions & 0 deletions backport-commit-message.rej
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
Backport PR #7724
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0296e8f802e99f973e963e26e2fdf3799c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388ce830af359ff73894189b4dda40b0dfbcd
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8afe2ec8947cc40db14f80ea8d17272b13
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c415002e8ef5e6910e3c53cfa8c14fcf97
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec7560c991e730aa34ad9ee647195fc78bf66
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803f2b33b74fb157236bffa7948e34663625
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b7629490ad8c1667c0c84d2fec4622404dcba2e7
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f07b187e84ab6c884a8e789de524972720
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e17c31ad9d10d94be3452ff9ea43dd6cb4
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb060c426c79c4198d00c8cee60aa0795c4be
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa789d8b7069a82b376f586d7560ef03993
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041cadbc56c706dfc8021f0316d4807cc614f
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a96838b0679df4697847cc085f5bc858092d1
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac112f389974afb6830d10a02df228e8b0429
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94cda962bb78b6c31f11a745b664d758fd7
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z

-------------------------------
**Backported based on diff from PR #7779**
12 changes: 12 additions & 0 deletions backport-guided-begin.rej
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

REMOTE="upstream"
BRANCH="jasper/backport/7724/7790/4.3"
WORKING_BRANCH="tmp/$BRANCH"
STARTING_SHA="38b01170577c3a5818fe5f38c14d06905b82140d"
ENDING_SHA="38b01170577c3a5818fe5f38c14d06905b82140d"

git fetch $REMOTE

git checkout -b $WORKING_BRANCH $ENDING_SHA
git rebase $STARTING_SHA^ --onto $BRANCH
10 changes: 10 additions & 0 deletions backport-guided-finish.rej
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

BRANCH="jasper/backport/7724/7790/4.3"
WORKING_BRANCH="tmp/$BRANCH"

git checkout $BRANCH
git reset --hard $WORKING_BRANCH
git branch -D $WORKING_BRANCH

sh backport-wrangle-into-commit.rej
12 changes: 12 additions & 0 deletions backport-wrangle-into-commit.rej
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

REMOTE="upstream"
BRANCH="jasper/backport/7724/7790/4.3"
COMMIT_MSG=`cat backport-commit-message.rej`

git reset --soft $REMOTE/$BRANCH
git stash
git reset --hard HEAD^
git stash apply --index

git commit -m "$COMMIT_MSG" --no-verify

0 comments on commit f8245c0

Please sign in to comment.