Show More
@@ -314,7 +314,6 b' class cg1unpacker(object):' | |||||
314 | - number of heads stays the same: 1 |
|
314 | - number of heads stays the same: 1 | |
315 | """ |
|
315 | """ | |
316 | repo = repo.unfiltered() |
|
316 | repo = repo.unfiltered() | |
317 | wasempty = (len(repo.changelog) == 0) |
|
|||
318 | def csmap(x): |
|
317 | def csmap(x): | |
319 | repo.ui.debug("add changeset %s\n" % short(x)) |
|
318 | repo.ui.debug("add changeset %s\n" % short(x)) | |
320 | return len(cl) |
|
319 | return len(cl) | |
@@ -389,7 +388,7 b' class cg1unpacker(object):' | |||||
389 | self.callback = None |
|
388 | self.callback = None | |
390 | pr = prog(_('files'), efiles) |
|
389 | pr = prog(_('files'), efiles) | |
391 | newrevs, newfiles = _addchangegroupfiles( |
|
390 | newrevs, newfiles = _addchangegroupfiles( | |
392 |
repo, self, revmap, trp, pr, needfiles |
|
391 | repo, self, revmap, trp, pr, needfiles) | |
393 | revisions += newrevs |
|
392 | revisions += newrevs | |
394 | files += newfiles |
|
393 | files += newfiles | |
395 |
|
394 | |||
@@ -1033,7 +1032,7 b' def changegroup(repo, basenodes, source)' | |||||
1033 | # to avoid a race we use changegroupsubset() (issue1320) |
|
1032 | # to avoid a race we use changegroupsubset() (issue1320) | |
1034 | return changegroupsubset(repo, basenodes, repo.heads(), source) |
|
1033 | return changegroupsubset(repo, basenodes, repo.heads(), source) | |
1035 |
|
1034 | |||
1036 |
def _addchangegroupfiles(repo, source, revmap, trp, pr, needfiles |
|
1035 | def _addchangegroupfiles(repo, source, revmap, trp, pr, needfiles): | |
1037 | revisions = 0 |
|
1036 | revisions = 0 | |
1038 | files = 0 |
|
1037 | files = 0 | |
1039 | while True: |
|
1038 | while True: |
General Comments 0
You need to be logged in to leave comments.
Login now