Skip to content
Snippets Groups Projects
Commit 192e0268 authored by Andrew Pritchard's avatar Andrew Pritchard
Browse files

setdiscovery: return anyincoming=False when remote's only head is nullid

This fixes (issue2907) a crash when using 'hg incoming --bundle' with an empty
remote repo and a non-empty local repo.

This also fixes an unreported bug that 'hg summary --remote' erroneously
reports incoming changes when the remote repo is empty and the local is not.

Also, add a test to make sure issue2907 stays fixed
parent 28e98a8b
No related branches found
No related tags found
No related merge requests found
......@@ -190,4 +190,5 @@
ui.warn(_("warning: repository is unrelated\n"))
return (set([nullid]), True, srvheadhashes,)
return (dag.externalizeall(result), True, srvheadhashes,)
anyincoming = (srvheadhashes != [nullid])
return dag.externalizeall(result), anyincoming, srvheadhashes
......@@ -465,3 +465,16 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 11
incoming from empty remote repository
$ hg init r1
$ hg init r2
$ echo a > r1/foo
$ hg -R r1 ci -Ama
adding foo
$ hg -R r1 incoming r2 --bundle x.hg
comparing with r2
searching for changes
no changes found
[1]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment