Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/fetch.py @ 2813:f362222cb8f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: drop commands.doupdate
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 08 Aug 2006 16:37:41 -0700
parents 4f7abf341cd4
children 0496cfb05243
comparison
equal deleted inserted replaced
2812:e0caea53c997 2813:f362222cb8f8
22 22
23 def postincoming(other, modheads): 23 def postincoming(other, modheads):
24 if modheads == 0: 24 if modheads == 0:
25 return 0 25 return 0
26 if modheads == 1: 26 if modheads == 1:
27 return commands.doupdate(ui, repo) 27 return hg.update(repo, repo.changelog.tip())
28 newheads = repo.heads(parent) 28 newheads = repo.heads(parent)
29 newchildren = [n for n in repo.heads(parent) if n != parent] 29 newchildren = [n for n in repo.heads(parent) if n != parent]
30 newparent = parent 30 newparent = parent
31 if newchildren: 31 if newchildren:
32 commands.doupdate(ui, repo, node=hex(newchildren[0]))
33 newparent = newchildren[0] 32 newparent = newchildren[0]
33 hg.update(repo, newparent)
34 newheads = [n for n in repo.heads() if n != newparent] 34 newheads = [n for n in repo.heads() if n != newparent]
35 err = False 35 err = False
36 if newheads: 36 if newheads:
37 ui.status(_('merging with new head %d:%s\n') % 37 ui.status(_('merging with new head %d:%s\n') %
38 (repo.changelog.rev(newheads[0]), short(newheads[0]))) 38 (repo.changelog.rev(newheads[0]), short(newheads[0])))