##// END OF EJS Templates
merge with stable
Benoit Boissinot -
r10864:8bc4ad7e merge default
parent child Browse files
Show More
@@ -1454,14 +1454,14 b' class localrepository(repo.repository):'
1454 try:
1454 try:
1455 common, fetch, rheads = self.findcommonincoming(remote, heads=heads,
1455 common, fetch, rheads = self.findcommonincoming(remote, heads=heads,
1456 force=force)
1456 force=force)
1457 if fetch == [nullid]:
1458 self.ui.status(_("requesting all changes\n"))
1459
1460 if not fetch:
1457 if not fetch:
1461 self.ui.status(_("no changes found\n"))
1458 self.ui.status(_("no changes found\n"))
1462 return 0
1459 return 0
1463
1460
1464 if heads is None and remote.capable('changegroupsubset'):
1461 if fetch == [nullid]:
1462 self.ui.status(_("requesting all changes\n"))
1463 elif heads is None and remote.capable('changegroupsubset'):
1464 # issue1320, avoid a race if remote changed after discovery
1465 heads = rheads
1465 heads = rheads
1466
1466
1467 if heads is None:
1467 if heads is None:
@@ -62,17 +62,13 b' XXX "GET http://localhost:/?cmd=capabili'
62 XXX "GET http://localhost:/?cmd=stream_out HTTP/1.1" - -
62 XXX "GET http://localhost:/?cmd=stream_out HTTP/1.1" - -
63 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
63 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
64 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
64 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
65 XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - -
65 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - -
66 XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - -
67 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
66 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
68 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
67 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
69 XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - -
68 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - -
70 XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - -
71 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
69 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
72 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
70 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
73 XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - -
71 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - -
74 XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - -
75 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
72 XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - -
76 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
73 XXX "GET http://localhost:/?cmd=heads HTTP/1.1" - -
77 XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - -
74 XXX "GET http://localhost:/?cmd=changegroup&roots=0000000000000000000000000000000000000000 HTTP/1.1" - -
78 XXX "GET http://localhost:/?bases=0000000000000000000000000000000000000000&cmd=changegroupsubset&heads=83180e7845de420a1bb46896fd5fe05294f8d629 HTTP/1.1" - -
General Comments 0
You need to be logged in to leave comments. Login now