Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 9429:d8143769e1d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: exclude common ancestor from --preview (issue1818)
author Patrick Mezard <pmezard@gmail.com>
date Sat, 05 Sep 2009 18:56:51 +0200
parents c2041f80f22a
children b5e9037d672b e78967d3dd6f
comparison
equal deleted inserted replaced
9428:5d6659cfaa06 9429:d8143769e1d4
2148 p2 = repo[node] 2148 p2 = repo[node]
2149 common = p1.ancestor(p2) 2149 common = p1.ancestor(p2)
2150 roots, heads = [common.node()], [p2.node()] 2150 roots, heads = [common.node()], [p2.node()]
2151 displayer = cmdutil.show_changeset(ui, repo, opts) 2151 displayer = cmdutil.show_changeset(ui, repo, opts)
2152 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: 2152 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
2153 displayer.show(repo[node]) 2153 if node not in roots:
2154 displayer.show(repo[node])
2154 return 0 2155 return 0
2155 2156
2156 return hg.merge(repo, node, force=opts.get('force')) 2157 return hg.merge(repo, node, force=opts.get('force'))
2157 2158
2158 def outgoing(ui, repo, dest=None, **opts): 2159 def outgoing(ui, repo, dest=None, **opts):