Show More
@@ -206,7 +206,7 b' def _process_files(tr, ctx, error=False)' | |||||
206 | touched.extend(removed) |
|
206 | touched.extend(removed) | |
207 |
|
207 | |||
208 | files = touched |
|
208 | files = touched | |
209 | mn = _commit_manifest(tr, linkrev, ctx, mctx, files, added, drop) |
|
209 | mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files, added, drop) | |
210 |
|
210 | |||
211 | return mn, files, filesadded, removed |
|
211 | return mn, files, filesadded, removed | |
212 |
|
212 | |||
@@ -347,7 +347,7 b' def _filecommit(' | |||||
347 | return fnode, touched |
|
347 | return fnode, touched | |
348 |
|
348 | |||
349 |
|
349 | |||
350 | def _commit_manifest(tr, linkrev, ctx, mctx, files, added, drop): |
|
350 | def _commit_manifest(tr, linkrev, ctx, mctx, manifest, files, added, drop): | |
351 | """make a new manifest entry (or reuse a new one) |
|
351 | """make a new manifest entry (or reuse a new one) | |
352 |
|
352 | |||
353 | given an initialised manifest context and precomputed list of |
|
353 | given an initialised manifest context and precomputed list of | |
@@ -370,8 +370,6 b' def _commit_manifest(tr, linkrev, ctx, m' | |||||
370 |
|
370 | |||
371 | m1 = m1ctx.read() |
|
371 | m1 = m1ctx.read() | |
372 |
|
372 | |||
373 | manifest = mctx.read() |
|
|||
374 |
|
||||
375 | if not files: |
|
373 | if not files: | |
376 | # if no "files" actually changed in terms of the changelog, |
|
374 | # if no "files" actually changed in terms of the changelog, | |
377 | # try hard to detect unmodified manifest entry so that the |
|
375 | # try hard to detect unmodified manifest entry so that the |
General Comments 0
You need to be logged in to leave comments.
Login now