Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 522:2f1de824798a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix empty pull bug that appeared this morning -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix empty pull bug that appeared this morning manifest hash: 53e4709a701f03d9905933c80758ba13caf3998c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxdJywK+sNU5EO8RAuoPAJ4tb9fd1Emm21/HLAEpyntaW2uoHQCfcc8z J8LB4mVG3gTsvRtiLZBVV/g= =+2C3 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 13:48:57 -0800
parents b0187336843c
children 003df62ae39f
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jun 29 11:16:41 2005 -0800
+++ b/mercurial/commands.py	Wed Jun 29 13:48:57 2005 -0800
@@ -302,8 +302,9 @@
             repo = hg.repository(ui, ".", create=1)
             other = hg.repository(ui, source)
             fetch = repo.findincoming(other)
-            cg = other.changegroup(fetch)
-            repo.addchangegroup(cg)
+            if fetch:
+                cg = other.changegroup(fetch)
+                repo.addchangegroup(cg)
 
         f = repo.opener("hgrc", "w")
         f.write("[paths]\n")
@@ -549,6 +550,10 @@
 
     other = hg.repository(ui, source)
     fetch = repo.findincoming(other)
+    if not fetch:
+        ui.status("no changes found\n")
+        return
+
     cg = other.changegroup(fetch)
     r = repo.addchangegroup(cg)
     if cg and not r: