Code review comment for lp://staging/~henninge/launchpad/bug-591731-is-published-removal

Looks good. One change discussed on IRC: instead of a variable called diverged_and_not_current_upstream, it may be easier to read to have one called diverged and another called current_upstream.

Thanks for the drive-by cleanups.