Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 9430:b5e9037d672b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 05 Sep 2009 19:39:46 +0200
parents c8e4dc218aaf d8143769e1d4
children c564dbb2a6d5 08914fd0fddb
comparison
equal deleted inserted replaced
9426:b42b03308ae9 9430:b5e9037d672b
2153 p2 = repo[node] 2153 p2 = repo[node]
2154 common = p1.ancestor(p2) 2154 common = p1.ancestor(p2)
2155 roots, heads = [common.node()], [p2.node()] 2155 roots, heads = [common.node()], [p2.node()]
2156 displayer = cmdutil.show_changeset(ui, repo, opts) 2156 displayer = cmdutil.show_changeset(ui, repo, opts)
2157 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: 2157 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
2158 displayer.show(repo[node]) 2158 if node not in roots:
2159 displayer.show(repo[node])
2159 return 0 2160 return 0
2160 2161
2161 return hg.merge(repo, node, force=opts.get('force')) 2162 return hg.merge(repo, node, force=opts.get('force'))
2162 2163
2163 def outgoing(ui, repo, dest=None, **opts): 2164 def outgoing(ui, repo, dest=None, **opts):