Mercurial > hg
comparison mercurial/commands.py @ 5266:d59ed18ec2d0
Merge with crew-stable
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 29 Aug 2007 16:19:27 -0700 |
| parents | 65dc707606ed bfd73b567b3d |
| children | 81575b7b505e |
comparison
equal
deleted
inserted
replaced
| 5265:15a108ad7adb | 5266:d59ed18ec2d0 |
|---|---|
| 2327 names[abs] = (rel, exact) | 2327 names[abs] = (rel, exact) |
| 2328 target_only[abs] = True | 2328 target_only[abs] = True |
| 2329 | 2329 |
| 2330 changes = repo.status(match=names.has_key)[:5] | 2330 changes = repo.status(match=names.has_key)[:5] |
| 2331 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) | 2331 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes) |
| 2332 | |
| 2333 # if f is a rename, also revert the source | |
| 2334 cwd = repo.getcwd() | |
| 2335 for f in added: | |
| 2336 src = repo.dirstate.copied(f) | |
| 2337 if src and src not in names and repo.dirstate[src] == 'r': | |
| 2338 removed[src] = None | |
| 2339 names[src] = (repo.pathto(src, cwd), True) | |
| 2332 | 2340 |
| 2333 revert = ([], _('reverting %s\n')) | 2341 revert = ([], _('reverting %s\n')) |
| 2334 add = ([], _('adding %s\n')) | 2342 add = ([], _('adding %s\n')) |
| 2335 remove = ([], _('removing %s\n')) | 2343 remove = ([], _('removing %s\n')) |
| 2336 forget = ([], _('forgetting %s\n')) | 2344 forget = ([], _('forgetting %s\n')) |