Lift 3.0 merged with master + #1560 #1562
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This includes a bunch of field binding and form snippet helpers. New versions are added for doing similar things with CssSels instead.
I was using string interpolation, but that doesn't work in 2.9.2, so I "fixed" it, but I really didn't, but now it's fixed :p
Move ConnectionIdentifier to util package. I also replaced the use of MongoIdentifier with ConnectionIdentifier. Then, I added RecordRules.fieldName that takes a ConnectionIdentifier as an argument. I had to add def connectionIdentifier to MetaRecord for this to work.
Because of the way specs2 matchers work, calculating the expected time in the call-by-name matcher could result in some weirdness. We now precompute the expected time.
Tweak some TimeHelpers specs for reliability.
2.6: Deprecate xbind-related things in Mapper. This includes a bunch of field binding and form snippet helpers. New versions are added for doing similar things with CssSels instead. They don't map 1-to-1 because CSS selector transforms don't support namespaces, amongst other things. Transforms are combined using andThen in case they match the same element or match a parent element and something else needs to affect the child.
Conflicts: persistence/mapper/src/main/scala/net/liftweb/mapper/Mapper.scala persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala web/webkit/src/main/scala/net/liftweb/http/Wizard.scala
This was referenced May 15, 2014
|
👍 |
|
Going to merge this in the morning, then open a quick PR that fixes the remaining warnings that have sprouted up (they should be pretty easy). Then I'm going to tag M0 so we can spin it over the weekend. |
Shadowfiend
added a commit
that referenced
this pull request
May 18, 2014
Merge with master + deprecated mongo/ConnectionIdentifier code removal.
|
Turns out some of the warnings are things I'm going to look at later, and a couple of unreachable code warnings are as far as I can tell simply incorrect. So that's cool… |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges the existing 2.6 work (mostly deprecations that were discarded in the merge) as well as the last commit of #1560 cherry-picked to
lift_30.@eltimn this should have all the changes of 1560, but reconciled with 2.6 history so that we can continue merging if we decide to (though we're probably rapidly nearing the point where we should consider lopping
lift_30off wholesale).All tests pass locally, though we've sprouted some warnings in the *record projects and in a few tests; I'll attend to those after this goes in.