Mercurial > hg
changeset 522:2f1de824798a
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 | 0fb8ade0f756 |
| children | 003df62ae39f |
| files | mercurial/commands.py mercurial/hg.py tests/test-pull tests/test-pull.out |
| diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
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:
--- a/mercurial/hg.py Wed Jun 29 11:16:41 2005 -0800 +++ b/mercurial/hg.py Wed Jun 29 13:48:57 2005 -0800 @@ -841,7 +841,6 @@ unknown.append(h) if not unknown: - self.ui.status("nothing to do!\n") return None rep = {}
--- a/tests/test-pull Wed Jun 29 11:16:41 2005 -0800 +++ b/tests/test-pull Wed Jun 29 13:48:57 2005 -0800 @@ -16,5 +16,6 @@ hg co cat foo hg manifest +hg pull kill $!
--- a/tests/test-pull.out Wed Jun 29 11:16:41 2005 -0800 +++ b/tests/test-pull.out Wed Jun 29 13:48:57 2005 -0800 @@ -15,4 +15,7 @@ 1 files, 1 changesets, 1 total revisions foo 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo +pulling from http://localhost:20059/ +searching for changes +no changes found killed!