From da886fef8c43f663e7bcbf058ff17f948ea49447 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Mon, 5 Apr 2010 20:36:34 +0200
Subject: [PATCH 1/4] Fix BaseCurrentPlaylistController with respect to
 test_add_at_position (at_position can be zero) (cherry picked from commit
 5623e26cc746afc45af13e213a67bcde0af751ed)

---
 mopidy/backends/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index ce022bd1..5ea08492 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -78,7 +78,7 @@ class BaseCurrentPlaylistController(object):
         :type at_position: int or :class:`None`
         """
         tracks = self.playlist.tracks
-        if at_position:
+        if at_position is not None:
             tracks.insert(at_position, track)
         else:
             tracks.append(track)

From d18e19d0940f1b09a809300254fb7ba898c4f00d Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Mon, 5 Apr 2010 21:31:55 +0200
Subject: [PATCH 2/4] Fix BaseCurrentPlaylistController with respect to
 test_move_single (cherry picked from commit
 3cb382e4956e5e0feefdb7c900b260e4176f2063)

---
 mopidy/backends/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 5ea08492..755215aa 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -138,6 +138,9 @@ class BaseCurrentPlaylistController(object):
         :param to_position: new position for the tracks
         :type to_position: int
         """
+        if start == end:
+            end += 1
+
         tracks = self.playlist.tracks
         new_tracks = tracks[:start] + tracks[end:]
         for track in tracks[start:end]:

From 7df5985abf25264e8fdbce867e59a518565333a1 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Mon, 5 Apr 2010 20:29:22 +0200
Subject: [PATCH 3/4] Fix BaseCurrentPlaylistController with respect to
 test_removing_from_empty_playlist (cherry picked from commit
 e82a15ee9cd9bddfe7a0c93ec1d1bad3ffc97f7b)

---
 mopidy/backends/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 755215aa..97c047fb 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -156,6 +156,10 @@ class BaseCurrentPlaylistController(object):
         :type track: :class:`mopidy.models.Track`
         """
         tracks = self.playlist.tracks
+
+        if track not in tracks:
+            return
+
         position = tracks.index(track)
         del tracks[position]
         self.playlist = self.playlist.with_(tracks=tracks)

From 3f84070fb12fd9d3bd4bac6c9114f26d17043e7a Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 5 Apr 2010 23:17:42 +0200
Subject: [PATCH 4/4] Prune .gitignore of old entries

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f127051..06ead765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *.pyc
 *.swp
 .coverage
-.idea
 .noseids
 MANIFEST
 build/
@@ -10,6 +9,3 @@ coverage.xml
 dist/
 docs/_build/
 nosetests.xml
-pip-log.txt
-src/
-tmp/