Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 2.10.x to 2.11.x #4357

Merged
merged 16 commits into from Feb 25, 2015
Merged

Merge 2.10.x to 2.11.x #4357

merged 16 commits into from Feb 25, 2015

Conversation

retronym
Copy link
Member 

% export MB=$(git merge-base origin/2.11.x origin/2.10.x)

% transcript git log --graph --oneline --decorate $MB...origin/2.10.x

https://gist.github.com/3de48ff88c17803a222a

% git merge -sours fbbd1b2
Merge made by the 'ours' strategy.

% git merge ad845ff
Auto-merging test/files/jvm/future-spec/PromiseTests.scala
CONFLICT (content): Merge conflict in test/files/jvm/future-spec/PromiseTests.scala
Auto-merging src/library/scala/concurrent/Promise.scala
CONFLICT (content): Merge conflict in src/library/scala/concurrent/Promise.scala
Automatic merge failed; fix conflicts and then commit the result.
merge/2.10.x-to-2.11.x-20150224 ~/code/scala3 git status
On branch merge/2.10.x-to-2.11.x-20150224
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:

    modified:   src/library/scala/concurrent/Promise.scala
    modified:   test/files/jvm/future-spec/PromiseTests.scala
    new file:   test/files/jvm/t8689.check
    new file:   test/files/jvm/t8689.scala

% git commit

[merge/2.10.x-to-2.11.x-20150224 1a7f4ec] Merge commit 'ad845ff' into merge/2.10.x-to-2.11.x-20150224

% git merge -sours b2f5101
Merge made by the 'ours' strategy.

som-snytt and others added 16 commits December 4, 2014 12:28
@som-snytt
SI-9027 Backport xml parser fix
736293a 
Fingers crossed, I have no local java 6 here to test.

No test because no q"" on 2.10.
@gkossakowski
Merge pull request scala#4186 from som-snytt/issue/9027-backport
3115f88 
SI-9027 Backport xml parser fix
@adriaanm
New CI validation scripts
706d68f 
Currently not validating the IDE, pending fix for
scala-ide/uber-build#48.

The new infrastructure is documented over at:
  - https://github.com/scala/scabot
  - https://github.com/scala/scala-jenkins-infra
  - [jenkins jobs definitions](https://github.com/scala/scala-jenkins-infra/tree/master/templates/default/jobs/validate)
@retronym
Merge pull request scala#4290 from adriaanm/2.10.x
ad0ddd4 
New CI validation scripts
@viktorklang @retronym
SI-8689 Avoid internal error in Promise after sequence of completions
bf20737 
Calling `completeWith` when the `DefaultPromise` is already completed,
leads to callbacks not being properly executed.

This happened because `Future.InternalCallbackExecutor` extends
`BatchingExecutor`[1] which assumes `unbatchedExecute` to be async,
when in this case it is sync, and if there is an exception thrown
by executing the batch, it creates a new batch with the remaining
items from the current batch and submits that to `unbatchedExecute`
and then rethrows, but if you have a sync `unbatchedExecute`, it will
fail since it is not reentrant, as witnessed by the failed `require`
as reported in this issue.

This commit avoids problem by delegating `completeWith` to
`tryComplete`, which has the effect of using `onComplete` +
`tryComplete` i.s.o. `complete`, which means that when it fails
(because of a benign race condition between completers) it won't
throw an exception.

It has been tested by the minimized reproducer.

[1] Actually, in the 2.10.x branch where this patch is starting out,
    "The BatchingExecutor trait had to be inlined into
    InternalCallbackExecutor for binary compatibility.". This comment
    will be more literally correct in the context of 2.11.x and beyond
@milessabin
Backported fix for SI-7753 to 2.10.x.
2f5ff59
@som-snytt
[backport] SI-4339 Event errors and attribute fix
fe7867f 
Improve attribute parsing and propagate errors
across event thread. Otherwise tests just hang.
This is tested, right?

This is an upstream port of scala-xml
5f2cfadeb9e8574ed66f37dc7a7a868eb129a8a9
@gkossakowski
Merge pull request scala#4303 from milessabin/topic/backport-7753
fbbd1b2 
Backported fix for SI-7753 to 2.10.x.
@gkossakowski
Merge pull request scala#4289 from retronym/ticket/8689
ad845ff 
SI-8689 Avoid internal error in Promise after sequence of completions
@som-snytt
[backport] SI-9060 Backpatch fifth-edition names
b4e3bec 
Because the compiler and library share some code in this
version, compiler must exclude xml tags that look like
Scala operators, such as `<:`.

This is an upstream port of:
scala-xml/commit/968f7bd94e934c781c19e25847ab09ac98cfbaf6
@adriaanm
Scaladoc js location synch more robust
f95b5b9 
Tested on:
  - Mac: FF35/Safari 8/Chrome 41
  - Win: IE11
@adriaanm
Merge pull request scala#4351 from adriaanm/scaladoc-2.10
47be353 
Scaladoc js location synch more robust
@gkossakowski
Merge pull request scala#4307 from som-snytt/issue/4339-2.10-b
b2f5101 
SI-4339 Backpatch event errors and attr fix
@retronym
Merge commit 'fbbd1b2' into merge/2.10.x-to-2.11.x-20150224
5601a5b
@retronym
Merge commit 'ad845ff' into merge/2.10.x-to-2.11.x-20150224
1a7f4ec 
Conflicts:
	src/library/scala/concurrent/Promise.scala
	test/files/jvm/future-spec/PromiseTests.scala
@retronym
Merge commit 'b2f5101' into merge/2.10.x-to-2.11.x-20150224
ce68a97
@scala-jenkins scala-jenkins added this to the 2.11.7 milestone Feb 24, 2015
@retronym retronym modified the milestones: 2.11.6, 2.11.7 Feb 24, 2015
@retronym
Copy link
Member Author

Assigning to the 2.11.6 milestone, as the fix for SI-8869 should be included in that release.

@adriaanm
Copy link
Contributor

jenkins master ran out of disk space (scala/scala-jenkins-infra#37)

@adriaanm
Copy link
Contributor

/rebuild ce68a97

@adriaanm
Copy link
Contributor

the IDE failed in the same way on #4354...

I conclude this test is flaky -- where can we track this?

Failed tests:   testWithMultiplePartiallyAppliedFunctions(org.scalaide.ui.internal.editor.decorators.bynameparams.CallByNameParamAtCreationPresenterTest): expected:<Set(offset: 168, length: 2, offset: 230, length: 2, offset: 18, length: 2, offset: 208, length: 2, offset: 212, length: 2, offset: 244, length: 2, offset: 226, length: 2, offset: 190, length: 2)> but was:<Set(offset: 168, length: 2, offset: 230, length: 2, offset: 208, length: 2, offset: 212, length: 2, offset: 244, length: 2, offset: 226, length: 2, offset: 190, length: 2)>

retronym added a commit to retronym/scala-ide that referenced this pull request Feb 25, 2015
@retronym
Enable retry for a seemingly flaky test.
acd847c 
Failed a few times recently in Scala PR validation:

  scala/scala#4354
  scala/scala#4357
@retronym retronym mentioned this pull request Feb 25, 2015
Merged
@retronym
Copy link
Member Author

I conclude this test is flaky -- where can we track this?

I've submitted a PR to scala-ide to enable retry for that test.

@adriaanm
Copy link
Contributor

LGTM -- the other failures can safely be ignored

adriaanm added a commit that referenced this pull request Feb 25, 2015
@adriaanm
Merge pull request #4357 from retronym/merge/2.10.x-to-2.11.x-20150224
092690e 
Merge 2.10.x to 2.11.x
@adriaanm adriaanm merged commit 092690e into scala:2.11.x Feb 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.11.6
7 participants
@retronym @adriaanm @scala-jenkins @som-snytt @gkossakowski @viktorklang @milessabin