Mercurial > hg
comparison mercurial/copies.py @ 18362:5a4f220fbfca
copies: report found copies sorted
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 12 Dec 2012 02:38:14 +0100 |
| parents | 2330d97e7707 |
| children | 3cfaace0441e |
comparison
equal
deleted
inserted
replaced
| 18361:06f075836010 | 18362:5a4f220fbfca |
|---|---|
| 312 diverge2.update(fl) # reverse map for below | 312 diverge2.update(fl) # reverse map for below |
| 313 | 313 |
| 314 if fullcopy: | 314 if fullcopy: |
| 315 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | 315 repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
| 316 "% = renamed and deleted):\n") | 316 "% = renamed and deleted):\n") |
| 317 for f in fullcopy: | 317 for f in sorted(fullcopy): |
| 318 note = "" | 318 note = "" |
| 319 if f in copy: | 319 if f in copy: |
| 320 note += "*" | 320 note += "*" |
| 321 if f in diverge2: | 321 if f in diverge2: |
| 322 note += "!" | 322 note += "!" |