equal
deleted
inserted
replaced
2379 unknown=True, |
2379 unknown=True, |
2380 ignored=False, |
2380 ignored=False, |
2381 full=False, |
2381 full=False, |
2382 ) |
2382 ) |
2383 ): |
2383 ): |
|
2384 entry = dirstate.get_entry(f) |
|
2385 # We don't want to even attmpt to add back files that have been removed |
|
2386 # It would lead to a misleading message saying we're adding the path, |
|
2387 # and can also lead to file/dir conflicts when attempting to add it. |
|
2388 removed = entry and entry.removed |
2384 exact = match.exact(f) |
2389 exact = match.exact(f) |
2385 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f): |
2390 if ( |
|
2391 exact |
|
2392 or not explicitonly |
|
2393 and f not in wctx |
|
2394 and repo.wvfs.lexists(f) |
|
2395 and not removed |
|
2396 ): |
2386 if cca: |
2397 if cca: |
2387 cca(f) |
2398 cca(f) |
2388 names.append(f) |
2399 names.append(f) |
2389 if ui.verbose or not exact: |
2400 if ui.verbose or not exact: |
2390 ui.status( |
2401 ui.status( |