Mini floor pump + elaborate patch kit. Carrying a spare tube was in practice pointless for me. I ride differently sized wheels on different bikes. I can remember to take along my tire repair set, but remembering to swap the tube for another size has been beyond me - I usually ended up with the wrong size taken along.
I run a toolbag on each bike with the appropriate tubes. No brains or memory required. And I've done enough rides where tubes have died. Failures near the valves, the seam between tube and valve sleeve (very expensive latex tubes - both front and rear failed two miles apart), cuts that ran bigger than my patches ... Rides where I was running out of daylight. A ride that simply became "epic" with apparently several years of bad luck rolled into a solo century.