Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 8636:7aa1526d4fc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: whitespace cleanup
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Wed, 27 May 2009 16:25:31 +0200
parents 94ca38e63576
children f265106ccb53
comparison
equal deleted inserted replaced
8635:aaaf4af1c173 8636:7aa1526d4fc5
2087 p2 = repo[node] 2087 p2 = repo[node]
2088 common = p1.ancestor(p2) 2088 common = p1.ancestor(p2)
2089 roots, heads = [common.node()], [p2.node()] 2089 roots, heads = [common.node()], [p2.node()]
2090 displayer = cmdutil.show_changeset(ui, repo, opts) 2090 displayer = cmdutil.show_changeset(ui, repo, opts)
2091 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: 2091 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
2092 displayer.show(repo[node]) 2092 displayer.show(repo[node])
2093 return 0 2093 return 0
2094 2094
2095 return hg.merge(repo, node, force=opts.get('force')) 2095 return hg.merge(repo, node, force=opts.get('force'))
2096 2096
2097 def outgoing(ui, repo, dest=None, **opts): 2097 def outgoing(ui, repo, dest=None, **opts):