Show More
@@ -191,20 +191,20 b' def _process_files(tr, ctx, error=False)' | |||
|
191 | 191 | repo.ui.warn(_(b"trouble committing %s!\n") % uipathfn(f)) |
|
192 | 192 | raise |
|
193 | 193 | |
|
194 | files = metadata.ChangingFiles(touched=touched, added=filesadded) | |
|
194 | 195 | # update manifest |
|
195 | 196 | removed = [f for f in removed if f in m1 or f in m2] |
|
196 | 197 | drop = sorted([f for f in removed if f in m]) |
|
197 | 198 | for f in drop: |
|
198 | 199 | del m[f] |
|
199 |
if p2.rev() |
|
|
200 | if p2.rev() == nullrev: | |
|
201 | files.update_removed(removed) | |
|
202 | else: | |
|
200 | 203 | rf = metadata.get_removal_filter(ctx, (p1, p2, m1, m2)) |
|
201 |
|
|
|
204 | for f in removed: | |
|
205 | if not rf(f): | |
|
206 | files.mark_removed(f) | |
|
202 | 207 | |
|
203 | touched.extend(removed) | |
|
204 | ||
|
205 | files = metadata.ChangingFiles( | |
|
206 | touched=touched, added=filesadded, removed=removed | |
|
207 | ) | |
|
208 | 208 | mn = _commit_manifest(tr, linkrev, ctx, mctx, m, files.touched, added, drop) |
|
209 | 209 | |
|
210 | 210 | return mn, files |
General Comments 0
You need to be logged in to leave comments.
Login now