I'm not thrilled with the way I'm handling the dirstate update. Perhaps it'd be better to actually check the delta between the manifests and only rescan those files?