Mercurial > hg
comparison mercurial/narrowspec.py @ 42150:770f5f586ae5
narrow: make warning about possibly dirty files respect ui.relative-paths
Differential Revision: https://phab.mercurial-scm.org/D6264
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 18 Apr 2019 03:05:42 +0530 |
| parents | 0531dff73d0b |
| children | 84bd6ae2d1f6 |
comparison
equal
deleted
inserted
replaced
| 42145:607a0de9bae3 | 42150:770f5f586ae5 |
|---|---|
| 13 from . import ( | 13 from . import ( |
| 14 error, | 14 error, |
| 15 match as matchmod, | 15 match as matchmod, |
| 16 merge, | 16 merge, |
| 17 repository, | 17 repository, |
| 18 scmutil, | |
| 18 sparse, | 19 sparse, |
| 19 util, | 20 util, |
| 20 ) | 21 ) |
| 21 | 22 |
| 22 # The file in .hg/store/ that indicates which paths exit in the store | 23 # The file in .hg/store/ that indicates which paths exit in the store |
| 300 assert not trackeddirty | 301 assert not trackeddirty |
| 301 clean.extend(lookup) | 302 clean.extend(lookup) |
| 302 else: | 303 else: |
| 303 trackeddirty.extend(lookup) | 304 trackeddirty.extend(lookup) |
| 304 _deletecleanfiles(repo, clean) | 305 _deletecleanfiles(repo, clean) |
| 306 uipathfn = scmutil.getuipathfn(repo) | |
| 305 for f in sorted(trackeddirty): | 307 for f in sorted(trackeddirty): |
| 306 repo.ui.status(_('not deleting possibly dirty file %s\n') % f) | 308 repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f)) |
| 307 for f in clean + trackeddirty: | 309 for f in clean + trackeddirty: |
| 308 ds.drop(f) | 310 ds.drop(f) |
| 309 | 311 |
| 310 repo.narrowpats = newincludes, newexcludes | 312 repo.narrowpats = newincludes, newexcludes |
| 311 repo._narrowmatch = newmatch | 313 repo._narrowmatch = newmatch |