equal
deleted
inserted
replaced
2150 p2 = repo[node] |
2150 p2 = repo[node] |
2151 common = p1.ancestor(p2) |
2151 common = p1.ancestor(p2) |
2152 roots, heads = [common.node()], [p2.node()] |
2152 roots, heads = [common.node()], [p2.node()] |
2153 displayer = cmdutil.show_changeset(ui, repo, opts) |
2153 displayer = cmdutil.show_changeset(ui, repo, opts) |
2154 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: |
2154 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: |
2155 displayer.show(repo[node]) |
2155 if node not in roots: |
|
2156 displayer.show(repo[node]) |
2156 return 0 |
2157 return 0 |
2157 |
2158 |
2158 return hg.merge(repo, node, force=opts.get('force')) |
2159 return hg.merge(repo, node, force=opts.get('force')) |
2159 |
2160 |
2160 def outgoing(ui, repo, dest=None, **opts): |
2161 def outgoing(ui, repo, dest=None, **opts): |
3039 raise util.Abort(_("please specify just one revision")) |
3040 raise util.Abort(_("please specify just one revision")) |
3040 |
3041 |
3041 if not rev: |
3042 if not rev: |
3042 rev = node |
3043 rev = node |
3043 |
3044 |
3044 if not clean and check: |
3045 if check and clean: |
|
3046 raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
3047 |
|
3048 if check: |
3045 # we could use dirty() but we can ignore merge and branch trivia |
3049 # we could use dirty() but we can ignore merge and branch trivia |
3046 c = repo[None] |
3050 c = repo[None] |
3047 if c.modified() or c.added() or c.removed(): |
3051 if c.modified() or c.added() or c.removed(): |
3048 raise util.Abort(_("uncommitted local changes")) |
3052 raise util.Abort(_("uncommitted local changes")) |
3049 |
3053 |