diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -459,7 +459,7 @@ def histedit(ui, repo, *parent, **opts): # contains special revset characters like ":" the revset # parser can choke. parent = [node.hex(n) for n in discovery.findcommonoutgoing( - repo, other, [], force=opts.get('force')).missing[0:1]] + repo, other, revs, force=opts.get('force')).missing[0:1]] else: if opts.get('force'): raise util.Abort(_('--force only allowed with --outgoing')) diff --git a/tests/test-histedit-outgoing.t b/tests/test-histedit-outgoing.t --- a/tests/test-histedit-outgoing.t +++ b/tests/test-histedit-outgoing.t @@ -82,3 +82,24 @@ show the error from unrelated repos # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. + +test sensitivity to branch in URL: + + $ cd r2 + $ hg -q update 2 + $ hg -q branch foo + $ hg commit -m 'create foo branch' + $ HGEDITOR=cat hg histedit --outgoing '../r#foo' | grep -v comparing | grep -v searching + pick f26599ee3441 6 create foo branch + + # Edit history between f26599ee3441 and f26599ee3441 + # + # Commands: + # p, pick = use commit + # e, edit = use commit, but stop for amending + # f, fold = use commit, but fold into previous commit (combines N and N-1) + # d, drop = remove commit from history + # m, mess = edit message without changing commit content + # + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd ..