If I remember correctly, his set was Thorns, Down Down Down, Parachutes, Farmer and His Gun, a cover and a song I wasn't familiar with which I assume was off of When We Were Lions. So six total. And he plays with a friend who does backup vocals and plays the mandolin and harmonica and stuff. They sound fantastic together. The main reason I went to Warped - worth it.
Thorns is great, Parachutes is to be expected, but the rest of the set leaves something to be desired.
I think his friend on backup that you're talking about is Nick Worpole, really talented guy, adds a lot to the tracks.