# HG changeset patch # User Benoit Boissinot # Date 1270507569 -7200 # Node ID 8bc4ad7e34c80ddae7b7d8c1e52bf9c29af2181b # Parent 31e29566f3b5c40b95971ef3fe1403216f82dc36# Parent 60b42f318a6d0bb37aec12a7a6c55dd49cbd945b merge with stable diff -r 31e29566f3b5 -r 8bc4ad7e34c8 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Apr 05 20:35:47 2010 +0200 +++ b/mercurial/localrepo.py Tue Apr 06 00:46:09 2010 +0200 @@ -1454,14 +1454,14 @@ try: common, fetch, rheads = self.findcommonincoming(remote, heads=heads, force=force) - if fetch == [nullid]: - self.ui.status(_("requesting all changes\n")) - if not fetch: self.ui.status(_("no changes found\n")) return 0 - if heads is None and remote.capable('changegroupsubset'): + if fetch == [nullid]: + self.ui.status(_("requesting all changes\n")) + elif heads is None and remote.capable('changegroupsubset'): + # issue1320, avoid a race if remote changed after discovery heads = rheads if heads is None: diff -r 31e29566f3b5 -r 8bc4ad7e34c8 tests/test-http-proxy.out --- a/tests/test-http-proxy.out Mon Apr 05 20:35:47 2010 +0200 +++ b/tests/test-http-proxy.out Tue Apr 06 00:46:09 2010 +0200 @@ -62,17 +62,13 @@ XXX "GET http://localhost:/?cmd=stream_out HTTP/1.1" - - XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - -XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - -XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - - +XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - -XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - -XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - - +XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - -XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - -XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - - +XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - - XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - - -XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - - -XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - - +XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - -