Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 5125:90be02035993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 06 Aug 2007 20:31:15 +0200
parents d5126a0172ba 73fdc8bd3ed8
children c80af96943aa
comparison
equal deleted inserted replaced
5124:a2c11f49e989 5125:90be02035993
2010 2010
2011 def postincoming(ui, repo, modheads, optupdate): 2011 def postincoming(ui, repo, modheads, optupdate):
2012 if modheads == 0: 2012 if modheads == 0:
2013 return 2013 return
2014 if optupdate: 2014 if optupdate:
2015 if modheads == 1: 2015 if modheads <= 1:
2016 return hg.update(repo, None) 2016 return hg.update(repo, None)
2017 else: 2017 else:
2018 ui.status(_("not updating, since new heads added\n")) 2018 ui.status(_("not updating, since new heads added\n"))
2019 if modheads > 1: 2019 if modheads > 1:
2020 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) 2020 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))