##// END OF EJS Templates
Move empty local repo logic for pull into findincoming...
Matt Mackall -
r2108:30c7564f default
parent child Browse files
Show More
@@ -831,13 +831,18 b' class localrepository(object):'
831 if base == None:
831 if base == None:
832 base = {}
832 base = {}
833
833
834 if not heads:
835 heads = remote.heads()
836
837 if self.changelog.tip() == nullid:
838 if heads != [nullid]:
839 return [nullid]
840 return []
841
834 # assume we're closer to the tip than the root
842 # assume we're closer to the tip than the root
835 # and start by examining the heads
843 # and start by examining the heads
836 self.ui.status(_("searching for changes\n"))
844 self.ui.status(_("searching for changes\n"))
837
845
838 if not heads:
839 heads = remote.heads()
840
841 unknown = []
846 unknown = []
842 for h in heads:
847 for h in heads:
843 if h not in m:
848 if h not in m:
@@ -998,12 +1003,9 b' class localrepository(object):'
998 def pull(self, remote, heads=None, force=False):
1003 def pull(self, remote, heads=None, force=False):
999 l = self.lock()
1004 l = self.lock()
1000
1005
1001 # if we have an empty repo, fetch everything
1006 fetch = self.findincoming(remote, force=force)
1002 if self.changelog.tip() == nullid:
1007 if fetch == [nullid]:
1003 self.ui.status(_("requesting all changes\n"))
1008 self.ui.status(_("requesting all changes\n"))
1004 fetch = [nullid]
1005 else:
1006 fetch = self.findincoming(remote, force=force)
1007
1009
1008 if not fetch:
1010 if not fetch:
1009 self.ui.status(_("no changes found\n"))
1011 self.ui.status(_("no changes found\n"))
@@ -1,7 +1,5 b''
1 requesting all changes
2 abort: error: Connection refused
1 abort: error: Connection refused
3 255
2 255
4 copy: No such file or directory
3 copy: No such file or directory
5 requesting all changes
6 abort: HTTP Error 404: File not found
4 abort: HTTP Error 404: File not found
7 255
5 255
@@ -1,6 +1,5 b''
1 abort: repository a not found!
1 abort: repository a not found!
2 255
2 255
3 requesting all changes
4 abort: error: Connection refused
3 abort: error: Connection refused
5 255
4 255
6 abort: repository a not found!
5 abort: repository a not found!
General Comments 0
You need to be logged in to leave comments. Login now