[mb-commits] branch, beta, updated. Fix bad merge of MBS-5609 + MBS-5711.
MusicBrainz Git Server <[email protected]> Mon, 21 Jan 2013 11:24:05 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TxFTx-0007bp-Ad@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5fe216b9ebc8d7850634d5b5a863f815b03b5f04 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=059815430fd6c11103d20f2bed326497631ec576 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3a8669e9dbb1cc0afa747417f3463d29d10b2cc8 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=72b7f7b0971ba7018d1b2147006e626de9b806ae (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f0d82386328f59cf91cbe6a4858b1a1ac1208af6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1ae3bf7fc82e0f4f453d94596652520f40852d33 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d4c0798ecccb99df95f241fd9f42584a689de11d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9542ec14eb6c3d72644a00ae004477a26ec2ab73 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=26eee99675a4ecadea2cf7060732b659b251c864 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b94821bdd51e0bde157742458c795ce5831b58d6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=260c15adaf152178d2c40e22e4dc448c4ae0805d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6b566b1aeda2a0f745185dbe06385e108b01b0cb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=43f33f78acd2123028d6c9bf7da4387c3981b367 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e1c5960a5d52ff3fb7e42ebd96eab14d4fc58241 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8325438618c2756317eed62d117f694bb26aa227 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c48b220542b3459d7c885c85a1e2253c0ffa7c09 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=136c63be1c15d460c8b69bac9e2a6e1a1aedaf33 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f0b7974de504d3b076ae09fea31f12834cfccbab (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=451b1b5ea39ae0d8460ce1176343adb68e559b86 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=03d74312092ab8fee37aeb4a68bc3d8bc91227bf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=684829a0528fdd3c2f757c61a868130f7ea7035d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=66d6b59e500f40ab26bd085e4c8478d201c2fe67 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=790ae4590e4ee982877bc883e0b116e1db5b7bf0 (commit)
Summary of changes:
Makefile.PL | 1 +
lib/MusicBrainz/Server/Controller.pm | 5 +-
lib/MusicBrainz/Server/Controller/Artist.pm | 7 +-
.../WebService/Serializer/JSON/2/Relation.pm | 20 +++--
.../Server/WebService/Serializer/JSON/2/Release.pm | 4 +-
.../WebService/Serializer/JSON/2/Role/Aliases.pm | 10 +--
.../WebService/Serializer/JSON/2/Role/IPIs.pm | 2 +
.../WebService/Serializer/JSON/2/Role/LifeSpan.pm | 13 +---
.../Server/WebService/Serializer/JSON/2/Utils.pm | 16 ++++
script/release-group-sql-dump.pl | 12 ++-
.../Server/Controller/WS/2/JSON/BrowseArtists.pm | 22 +++---
.../Controller/WS/2/JSON/BrowseReleaseGroups.pm | 3 -
.../Server/Controller/WS/2/JSON/BrowseReleases.pm | 2 -
.../Server/Controller/WS/2/JSON/LookupArtist.pm | 88 +++++++++++++++-----
.../Server/Controller/WS/2/JSON/LookupLabel.pm | 4 +-
.../Server/Controller/WS/2/JSON/LookupRecording.pm | 38 ++++++++-
.../Server/Controller/WS/2/JSON/LookupRelease.pm | 16 ++--
.../Controller/WS/2/JSON/LookupReleaseGroup.pm | 3 -
.../Server/Controller/WS/2/JSON/LookupWork.pm | 10 ++-
.../Server/Controller/WS/2/LookupArtist.pm | 20 +++++
.../Server/Controller/WS/2/LookupRecording.pm | 22 +++++
t/lib/t/MusicBrainz/Server/Controller/Work/Edit.pm | 4 +-
t/sql/webservice.sql | 7 ++
23 files changed, 235 insertions(+), 94 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5fe216b9ebc8d7850634d5b5a863f815b03b5f04
Author: warp <[email protected]>
Date: Mon Jan 21 12:22:34 2013 +0100
Fix bad merge of MBS-5609 + MBS-5711.
diff --git a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
index fbf0678..b8ef65f 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
@@ -719,7 +719,6 @@ test 'artist lookup with artist relations' => sub {
name => "7人祭",
"sort-name" => "7nin Matsuri",
disambiguation => "",
- ipis => [],
},
begin => '2001',
end => JSON::null,
commit 059815430fd6c11103d20f2bed326497631ec576
Merge: 3a8669e d4c0798
Author: warp <[email protected]>
Date: Mon Jan 21 12:21:09 2013 +0100
Merge branch 'mbs-5609' into beta
* mbs-5609:
MBS-5609, add a release relationship in the webservice tests.
MBS-5609, add artist "member of band" artist relationship in webservice tests (this tests a begin date).
MBS-5609, rename dateperiod to date_period.
MBS-5609, remove some bitrot from script/release-group-sql-dump.pl and use it to add an l_artist_artist link in t/sql/webservice.sql.
MBS-5609, rename the inaccurate WebService::Serializer::JSON::2::Utils::partialdate to dateperiod.
MBS-5609, move serializing of a group of begind/end partialdates to a seperate function.
MBS-5609, enable release relationships and include relationship dates in /ws/2 json webservice.
commit 3a8669e9dbb1cc0afa747417f3463d29d10b2cc8
Merge: 72b7f7b 1ae3bf7
Author: warp <[email protected]>
Date: Mon Jan 21 12:21:05 2013 +0100
Merge branch 'mbs-5586' into beta
* mbs-5586:
MBS-5586, do not change the order of post_creation and on_creation hooks.
MBS-5586, both post_creation and on_creation hooks should be called from within the transaction.
MBS-5586, clarify use of the post_creation and on_creation hooks.
MBS-5586, do not call "post_creation" if no edit was created.
commit 72b7f7b0971ba7018d1b2147006e626de9b806ae
Merge: f0d8238 43f33f7
Author: warp <[email protected]>
Date: Mon Jan 21 12:20:59 2013 +0100
Merge branch 'mbs-5711' into beta
* mbs-5711:
MBS-5711, do not include IPIs in json webservice unless they're on a toplevel entity.
diff --cc t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm
index 04c6887,64ac4b7..42d2a2d
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupRelease.pm
@@@ -187,14 -152,13 +187,13 @@@ test 'release lookup with artists + ali
"sort-name" => "m-flo",
disambiguation => "",
aliases => [
- { "sort-name" => "m-flow", name => "m-flow" },
- { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew" },
- { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew" },
- { "sort-name" => "mflo", name => "mflo" },
- { "sort-name" => "えむふろう", name => "えむふろう" },
- { "sort-name" => "エムフロウ", name => "エムフロウ" },
+ { "sort-name" => "m-flow", name => "m-flow", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "mediarite-flow crew", name => "mediarite-flow crew", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "meteorite-flow crew", name => "meteorite-flow crew", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "mflo", name => "mflo", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "えむふろう", name => "えむふろう", locale => JSON::null, primary => JSON::null, type => JSON::null },
+ { "sort-name" => "エムフロウ", name => "エムフロウ", locale => JSON::null, primary => JSON::null, type => JSON::null },
],
- ipis => [],
}
}],
date => "2004-03-17",
commit f0d82386328f59cf91cbe6a4858b1a1ac1208af6
Merge: 790ae45 b94821b
Author: warp <[email protected]>
Date: Mon Jan 21 12:20:52 2013 +0100
Merge branch 'mbs-5712' into beta
* mbs-5712:
MBS-5713, include alias type in json webservice.
MBS-5713, include alias type in JSON webservice.
MBS-5712, semi-colon missing from previous commit.
MBS-5712, always include alias locale and primary flag.
commit d4c0798ecccb99df95f241fd9f42584a689de11d
Merge: 9542ec1 790ae45
Author: warp <[email protected]>
Date: Mon Jan 21 12:13:14 2013 +0100
Merge branch 'beta' into mbs-5609
* beta: (144 commits)
Remove erroneous @href from button element
MBH-298, move $lb_scheme stuff up in the configuration so that it's used by the www.musicbrainz.org redirect as well.
MBH-298, when rewriting urls, use the scheme sent by the load balancer instead of our local scheme.
MBH-298, Force correct server hostname/port on rewrites.
Listen on port 81, enable proxy in socket-deploy.
Update translations from transifex.
Update .pot files.
MBS-5652: use a left join so label-less catalog numbers still work correctly
Allowing us to use permanent citation URLs from Trove
Fix invalid syntax
Fix invalid use of `with_translations`
Try fixing the edit ID conflict a different way
Revert "Change edit ID number in webservice.sql, conflicting with statistics.sql"
Change edit ID number in webservice.sql, conflicting with statistics.sql
Change editor name in webservice.sql, since it seems to be breaking a unique constraint in tests
MBS-5749: Add edit profile link to 401 error page
MBS-5652: linebreaks
MBS-5540: Release editor eats tracklists
MBS-2411, changes based on feedback from code review.
MBS-5702: Tweak link to wikipedia below wikipedia extracts
...
Conflicts:
lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Relation.pm
t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
diff --cc lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Relation.pm
index 10874d7,0759482..d20701d
--- a/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Relation.pm
+++ b/lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Relation.pm
@@@ -20,10 -18,11 +20,11 @@@ sub serializ
if ($entity->target_type eq 'artist' ||
$entity->target_type eq 'label' ||
- # $entity->target_type eq 'release' ||
+ $entity->target_type eq 'release' ||
+ $entity->target_type eq 'release_group' ||
$entity->target_type eq 'recording')
{
- $body{$entity->target_type} = serialize_entity ($entity->target);
+ $body->{$entity->target_type} = serialize_entity ($entity->target);
}
elsif ($entity->target_type eq 'url')
{
diff --cc t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
index 2b53865,b61747e..0466c4b
--- a/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/WS/2/JSON/LookupArtist.pm
@@@ -160,11 -151,10 +163,12 @@@ test 'basic artist lookup, inc=url-rels
{
direction => "forward",
url => "http://www.paulallgood.com/",
- type => "blog"
- },
- ],
+ type => "blog",
+ begin => JSON::null,
+ end => JSON::null,
+ ended => JSON::false,
+ }],
+ ipis => [],
});
};
@@@ -662,41 -681,4 +695,43 @@@ test 'artist lookup with works (using l
});
};
+
+test 'artist lookup with artist relations' => sub {
+
+ MusicBrainz::Server::Test->prepare_test_database(shift->c, '+webservice');
+
+ ws_test_json 'artist lookup with artist relations',
+ '/artist/678ba12a-e485-44c7-8eaf-25e61a78a61b?inc=artist-rels' => encode_json (
+ {
+ id => "678ba12a-e485-44c7-8eaf-25e61a78a61b",
+ name => "後藤真希",
+ "sort-name" => "Goto, Maki",
+ country => "JP",
+ disambiguation => "",
+ "life-span" => {
+ begin => "1985-09-23",
+ end => JSON::null,
+ ended => JSON::false,
+ },
+ type => "Person",
+ relations => [
+ {
+ type => 'member of band',
+ direction => 'forward',
+ artist => {
+ id => "802673f0-9b88-4e8a-bb5c-dd01d68b086f",
+ name => "7人祭",
+ "sort-name" => "7nin Matsuri",
+ disambiguation => "",
++ ipis => [],
+ },
+ begin => '2001',
+ end => JSON::null,
+ ended => JSON::false,
+ }
- ]
++ ],
++ ipis => [],
+ });
+};
+
1;
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server
_______________________________________________
MusicBrainz-commits mailing list
[email protected]
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits