sync with sf,use hg