Mercurial > hg
comparison mercurial/cmdutil.py @ 9000:59bb11a97fe5
Merge with mpm
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 30 Jun 2009 23:17:57 +0200 |
| parents | 37a9d551346c |
| children | c68ccda3451b |
comparison
equal
deleted
inserted
replaced
| 8999:159283d79e69 | 9000:59bb11a97fe5 |
|---|---|
| 321 if not dry_run: | 321 if not dry_run: |
| 322 repo.remove(remove) | 322 repo.remove(remove) |
| 323 repo.add(add) | 323 repo.add(add) |
| 324 if similarity > 0: | 324 if similarity > 0: |
| 325 for old, new, score in findrenames(repo, m, similarity): | 325 for old, new, score in findrenames(repo, m, similarity): |
| 326 oldexact, newexact = m.exact(old), m.exact(new) | 326 if repo.ui.verbose or not m.exact(old) or not m.exact(new): |
| 327 if repo.ui.verbose or not oldexact or not newexact: | |
| 328 oldrel, newrel = m.rel(old), m.rel(new) | |
| 329 repo.ui.status(_('recording removal of %s as rename to %s ' | 327 repo.ui.status(_('recording removal of %s as rename to %s ' |
| 330 '(%d%% similar)\n') % | 328 '(%d%% similar)\n') % |
| 331 (oldrel, newrel, score * 100)) | 329 (m.rel(old), m.rel(new), score * 100)) |
| 332 if not dry_run: | 330 if not dry_run: |
| 333 repo.copy(old, new) | 331 repo.copy(old, new) |
| 334 | 332 |
| 335 def copy(ui, repo, pats, opts, rename=False): | 333 def copy(ui, repo, pats, opts, rename=False): |
| 336 # called with the repo lock held | 334 # called with the repo lock held |