merge with stable

mercurial/commands.py

@@ -564,6 +564,10 @@ def bundle(ui, repo, fname, dest=None, **opts):
         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:

mercurial/demandimport.py

@@ -133,6 +133,7 @@ ignore = [
     # 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():

tests/test-bundle-r

@@ -72,6 +72,8 @@ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
 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

tests/test-bundle-r.out

@@ -162,6 +162,7 @@ abort: repository default-push not found!
 4 changesets found
 6 changesets found
 1 changesets found
+no changes found
 1 changesets found
 4 changesets found
 updating to branch default