Just a quick add....

don't forget that Calvin upheld strict moral reforms in Geneva(including restictions on theaters, plays, dancing, taverns,etc.)

.....so I guess the question would be... was he suppressing Christian liberty or promoting Godly living?

The mercy of God is necessary not only when a person repents, but even to lead him to repent, Augustine