--- a/mercurial/commands.py Tue Mar 09 19:04:18 2010 +0100
+++ b/mercurial/commands.py Tue Mar 09 20:47:35 2010 +0100
@@ -564,6 +564,10 @@
revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
o = repo.findoutgoing(other, force=opts.get('force'))
+ if not o:
+ ui.status(_("no changes found\n"))
+ return
+
if revs:
cg = repo.changegroupsubset(o, revs, 'bundle')
else:
--- a/mercurial/demandimport.py Tue Mar 09 19:04:18 2010 +0100
+++ b/mercurial/demandimport.py Tue Mar 09 20:47:35 2010 +0100
@@ -133,6 +133,7 @@
# setuptools' pkg_resources.py expects "from __main__ import x" to
# raise ImportError if x not defined
'__main__',
+ '_ssl', # conditional imports in the stdlib, issue1964
]
def enable():
--- a/tests/test-bundle-r Tue Mar 09 19:04:18 2010 +0100
+++ b/tests/test-bundle-r Tue Mar 09 20:47:35 2010 +0100
@@ -72,6 +72,8 @@
hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
hg -R test bundle --base 2 test-bundle-all.hg
hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
+# empty bundle
+hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
# issue76 msg2163
hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
--- a/tests/test-bundle-r.out Tue Mar 09 19:04:18 2010 +0100
+++ b/tests/test-bundle-r.out Tue Mar 09 20:47:35 2010 +0100
@@ -162,6 +162,7 @@
4 changesets found
6 changesets found
1 changesets found
+no changes found
1 changesets found
4 changesets found
updating to branch default