diff --git a/hgext/patchbomb.py b/hgext/patchbomb.py --- a/hgext/patchbomb.py +++ b/hgext/patchbomb.py @@ -230,6 +230,7 @@ def patchbomb(ui, repo, *revs, **opts): def outgoing(dest, revs): '''Return the revisions present locally but not in dest''' dest = ui.expandpath(dest or 'default-push', dest or 'default') + dest, revs, checkout = hg.parseurl(dest, revs) revs = [repo.lookup(rev) for rev in revs] other = hg.repository(cmdutil.remoteui(repo, opts), dest) ui.status(_('comparing with %s\n') % dest) diff --git a/tests/test-patchbomb b/tests/test-patchbomb --- a/tests/test-patchbomb +++ b/tests/test-patchbomb @@ -182,3 +182,11 @@ export HGENCODING hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \ -s test -r 0 cat tmp.mbox | fixheaders + +echo "% test outgoing and dest#branch URIs" +hg up 1 +hg branch test +echo d > d +hg add d +hg ci -md -d '4 0' +hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test | fixheaders diff --git a/tests/test-patchbomb.out b/tests/test-patchbomb.out --- a/tests/test-patchbomb.out +++ b/tests/test-patchbomb.out @@ -1533,3 +1533,38 @@ diff -r 000000000000 -r 8580ff50825a a +a +% test outgoing and dest#branch URIs +0 files updated, 0 files merged, 6 files removed, 0 files unresolved +marked working directory as branch test +created new head +comparing with ../t +searching for changes +This patch series consists of 1 patches. + + +Displaying [PATCH] test ... +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [PATCH] test +X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 +Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@ +User-Agent: Mercurial-patchbomb +Date: Tue, 01 Jan 1980 00:01:00 +0000 +From: test +To: foo + +# HG changeset patch +# User test +# Date 4 0 +# Branch test +# Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268 +# Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9 +d + +diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/d Thu Jan 01 00:00:04 1970 +0000 +@@ -0,0 +1,1 @@ ++d +