This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6264

narrow: make warning about possibly dirty files respect ui.relative-paths
ClosedPublic

Authored by martinvonz on Apr 17 2019, 1:58 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG770f5f586ae5: narrow: make warning about possibly dirty files respect ui.relative-paths

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 17 2019, 1:58 PM
pulkit accepted this revision.Apr 17 2019, 5:15 PM
martinvonz retitled this revision from narrow: make warning about dirty possibly files respect ui.relative-paths to narrow: make warning about possibly dirty files respect ui.relative-paths.Apr 17 2019, 5:21 PM
Closed by commit rHG770f5f586ae5: narrow: make warning about possibly dirty files respect ui.relative-paths (authored by martinvonz). · Explain WhyApr 17 2019, 6:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/narrowspec.py (4 lines)

Diff 14814

mercurial/narrowspec.py

import errno import errno
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
match as matchmod, match as matchmod,
merge, merge,
repository, repository,
scmutil,
sparse, sparse,
util, util,
) )
# The file in .hg/store/ that indicates which paths exit in the store # The file in .hg/store/ that indicates which paths exit in the store
FILENAME = 'narrowspec' FILENAME = 'narrowspec'
# The file in .hg/ that indicates which paths exit in the dirstate # The file in .hg/ that indicates which paths exit in the dirstate
DIRSTATE_FILENAME = 'narrowspec.dirstate' DIRSTATE_FILENAME = 'narrowspec.dirstate'
trackeddirty = status.modified + status.added trackeddirty = status.modified + status.added
clean = status.clean clean = status.clean
if assumeclean: if assumeclean:
assert not trackeddirty assert not trackeddirty
clean.extend(lookup) clean.extend(lookup)
else: else:
trackeddirty.extend(lookup) trackeddirty.extend(lookup)
_deletecleanfiles(repo, clean) _deletecleanfiles(repo, clean)
uipathfn = scmutil.getuipathfn(repo)
for f in sorted(trackeddirty): for f in sorted(trackeddirty):
repo.ui.status(_('not deleting possibly dirty file %s\n') % f) repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f))
for f in clean + trackeddirty: for f in clean + trackeddirty:
ds.drop(f) ds.drop(f)
repo.narrowpats = newincludes, newexcludes repo.narrowpats = newincludes, newexcludes
repo._narrowmatch = newmatch repo._narrowmatch = newmatch
pctx = repo['.'] pctx = repo['.']
newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds] newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds]
for f in newfiles: for f in newfiles:
ds.normallookup(f) ds.normallookup(f)
_writeaddedfiles(repo, pctx, newfiles) _writeaddedfiles(repo, pctx, newfiles)