[mb-commits] branch, beta, updated. Merge remote-tracking branch 'ianmcorvidae/mbs-5191' into beta add the apostr...

The branch, beta has been updated
       via 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3e249b143e1e1be8f7cc0a99578f3c9bda94d5ff (commit)
       via 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=310d872634eec33df643f8e9b6d4b1636e3732c8 (commit)
       via 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a6be9a48f9e35caae57c6c568a75093915d17566 (commit)
       via 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5a70f83a82097f15d8c30f3722ee9db1eb06152a (commit)
       via 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f80519e9396a6e0809967698fb49f548d7b52613 (commit)
      from 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0e2964682809b837e06ca74f07b5e8da76a84129 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Connector.pm      |    5 -----
 lib/MusicBrainz/Server/Data/EntityTag.pm |    3 ++-
 lib/MusicBrainz/Server/Model/MB.pm       |   12 ++++++++++--
 root/edit/details/macros.tt              |    2 +-
 4 files changed, 13 insertions(+), 9 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 3e249b143e1e1be8f7cc0a99578f3c9bda94d5ff
Merge: f80519e 310d872
Author: Oliver Charles <ollie <at> ocharles.org.uk>
Date:   Tue Aug 21 10:56:30 2012 +0100

    Merge remote-tracking branch 'ianmcorvidae/mbs-5191' into beta

    * ianmcorvidae/mbs-5191:
      add the apostrophe.
      Allow scripts to run without a PG statement timeout

commit 310d872634eec33df643f8e9b6d4b1636e3732c8
Author: Ian McEwen <ianmcorvidae <at> ianmcorvidae.net>
Date:   Tue Aug 21 02:55:01 2012 -0700

    add the apostrophe.

diff --git a/root/edit/details/macros.tt b/root/edit/details/macros.tt
index 170c249..2e82198 100644
--- a/root/edit/details/macros.tt
+++ b/root/edit/details/macros.tt
 <at>  <at>  -87,7 +87,7  <at>  <at> 
     <td class="edit-cover-art">
       [%- SET history_message = l('We are unable to display history for cover
           art. For a current listing of cover art, please see the
-          {coverart|releases cover art page}.',
+          {coverart|release\'s cover art page}.',
           { coverart => c.uri_for_action('/release/cover_art', [ release.gid ]) }) %]

commit f80519e9396a6e0809967698fb49f548d7b52613
Author: Oliver Charles <ollie <at> ocharles.org.uk>
Date:   Mon Aug 20 16:44:46 2012 +0100

    MBS-5110: Serialize tagging entities based on entity ID

    If 2 threads are running the transaction at the same time, with the same input
    they will usually fail because the first transaction will sucessfully insert the
    tag, while the second transaction will fail due to violating the primary key. By
    serializing transactions on the entity themselves, this violation is no longer
    possible.

diff --git a/lib/MusicBrainz/Server/Data/EntityTag.pm b/lib/MusicBrainz/Server/Data/EntityTag.pm
index b728707..d980035 100644
--- a/lib/MusicBrainz/Server/Data/EntityTag.pm
+++ b/lib/MusicBrainz/Server/Data/EntityTag.pm
 <at>  <at>  -243,9 +243,10  <at>  <at>  sub update
      <at> new_tags = $self->parse_tags($input);

     Sql::run_in_transaction(sub {
+        # Lock the entity being tagged to prevent concurrency issues
+        $self->parent->get_by_id_locked($entity_id);

         # Load the existing raw tag ids for this entity
-
         my %old_tag_info;
         my  <at> old_tags;
         my $old_tag_ids = $self->sql->select_single_column_array("

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

hooks/post-receive
--

-- 
mb_server