Show More
@@ -129,13 +129,7 b' def _prepare_files(tr, ctx, error=False,' | |||
|
129 | 129 | mn = p1.manifestnode() |
|
130 | 130 | files = metadata.ChangingFiles() |
|
131 | 131 | else: |
|
132 |
mn, |
|
|
133 | files = metadata.ChangingFiles() | |
|
134 | files.update_touched(touched) | |
|
135 | if added: | |
|
136 | files.update_added(added) | |
|
137 | if removed: | |
|
138 | files.update_removed(removed) | |
|
132 | mn, files = _process_files(tr, ctx, error=error) | |
|
139 | 133 | |
|
140 | 134 | if origctx and origctx.manifestnode() == mn: |
|
141 | 135 | origfiles = origctx.files() |
@@ -211,7 +205,11 b' def _process_files(tr, ctx, error=False)' | |||
|
211 | 205 | files = touched |
|
212 | 206 | mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files, added, drop) |
|
213 | 207 | |
|
214 | return mn, files, filesadded, removed | |
|
208 | files = metadata.ChangingFiles( | |
|
209 | touched=files, added=filesadded, removed=removed | |
|
210 | ) | |
|
211 | ||
|
212 | return mn, files | |
|
215 | 213 | |
|
216 | 214 | |
|
217 | 215 | def _filecommit( |
General Comments 0
You need to be logged in to leave comments.
Login now