##// END OF EJS Templates
changegroup: note during bundle apply if the repo was empty...
Augie Fackler -
r27218:de3335b4 default
parent child Browse files
Show More
@@ -312,6 +312,7 b' class cg1unpacker(object):'
312 - number of heads stays the same: 1
312 - number of heads stays the same: 1
313 """
313 """
314 repo = repo.unfiltered()
314 repo = repo.unfiltered()
315 wasempty = (len(repo.changelog) == 0)
315 def csmap(x):
316 def csmap(x):
316 repo.ui.debug("add changeset %s\n" % short(x))
317 repo.ui.debug("add changeset %s\n" % short(x))
317 return len(cl)
318 return len(cl)
@@ -386,7 +387,7 b' class cg1unpacker(object):'
386 self.callback = None
387 self.callback = None
387 pr = prog(_('files'), efiles)
388 pr = prog(_('files'), efiles)
388 newrevs, newfiles = _addchangegroupfiles(
389 newrevs, newfiles = _addchangegroupfiles(
389 repo, self, revmap, trp, pr, needfiles)
390 repo, self, revmap, trp, pr, needfiles, wasempty)
390 revisions += newrevs
391 revisions += newrevs
391 files += newfiles
392 files += newfiles
392
393
@@ -903,7 +904,7 b' def changegroup(repo, basenodes, source)'
903 # to avoid a race we use changegroupsubset() (issue1320)
904 # to avoid a race we use changegroupsubset() (issue1320)
904 return changegroupsubset(repo, basenodes, repo.heads(), source)
905 return changegroupsubset(repo, basenodes, repo.heads(), source)
905
906
906 def _addchangegroupfiles(repo, source, revmap, trp, pr, needfiles):
907 def _addchangegroupfiles(repo, source, revmap, trp, pr, needfiles, wasempty):
907 revisions = 0
908 revisions = 0
908 files = 0
909 files = 0
909 while True:
910 while True:
General Comments 0
You need to be logged in to leave comments. Login now