This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6165

fix: allow fixing untracked files when given as arguments
ClosedPublic

Authored by hooper on Mar 21 2019, 10:56 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7f6b375a8903: fix: allow fixing untracked files when given as arguments
Summary

It's more useful to fix the file than to silently avoid it when the user does
this:

hg fix --working-dir untracked-file

We will still do nothing to ignored files, even if they are specified. This may
be safer, given that such files can unexpectedly slip into the arguments via a
shell glob or fileset.

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

hooper created this revision.Mar 21 2019, 10:56 PM
Closed by commit rHG7f6b375a8903: fix: allow fixing untracked files when given as arguments (authored by hooper). · Explain WhyMar 23 2019, 11:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (2 lines)
Mtests/test-fix.t (7 lines)

Diff 14590

hgext/fix.py

workqueue = [] workqueue = []
numitems = collections.defaultdict(int) numitems = collections.defaultdict(int)
maxfilesize = ui.configbytes('fix', 'maxfilesize') maxfilesize = ui.configbytes('fix', 'maxfilesize')
for rev in sorted(revstofix): for rev in sorted(revstofix):
fixctx = repo[rev] fixctx = repo[rev]
match = scmutil.match(fixctx, pats, opts) match = scmutil.match(fixctx, pats, opts)
for path in pathstofix(ui, repo, pats, opts, match, basectxs[rev], for path in pathstofix(ui, repo, pats, opts, match, basectxs[rev],
fixctx): fixctx):
if path not in fixctx:
continue
fctx = fixctx[path] fctx = fixctx[path]
if fctx.islink(): if fctx.islink():
continue continue
if fctx.size() > maxfilesize: if fctx.size() > maxfilesize:
ui.warn(_('ignoring file larger than %s: %s\n') % ui.warn(_('ignoring file larger than %s: %s\n') %
(util.bytecount(maxfilesize), path)) (util.bytecount(maxfilesize), path))
continue continue
workqueue.append((rev, path)) workqueue.append((rev, path))

tests/test-fix.t

ADDED ADDED
clean clean
ignored ignored
MODIFIED!!! MODIFIED!!!
unknown unknown
$ printf "modified!!!\n" > modified.whole $ printf "modified!!!\n" > modified.whole
$ printf "added\n" > added.whole $ printf "added\n" > added.whole
Listing the files explicitly causes untracked files to also be fixed, but
ignored files are still unaffected.
$ hg fix --working-dir *.whole $ hg fix --working-dir *.whole
$ hg status --all $ hg status --all
M clean.whole M clean.whole
M modified.whole M modified.whole
A added.whole A added.whole
R removed.whole R removed.whole
! deleted.whole ! deleted.whole
? unknown.whole ? unknown.whole
I ignored.whole I ignored.whole
C .hgignore C .hgignore
It would be better if this also fixed the unknown file.
$ cat *.whole $ cat *.whole
ADDED ADDED
CLEAN CLEAN
ignored ignored
MODIFIED!!! MODIFIED!!!
unknown UNKNOWN
$ cd .. $ cd ..
Test that incremental fixing works on files with additions, deletions, and Test that incremental fixing works on files with additions, deletions, and
changes in multiple line ranges. Note that deletions do not generally cause changes in multiple line ranges. Note that deletions do not generally cause
neighboring lines to be fixed, so we don't return a line range for purely neighboring lines to be fixed, so we don't return a line range for purely
deleted sections. In the future we should support a :deletion config that deleted sections. In the future we should support a :deletion config that
allows fixers to know where deletions are located. allows fixers to know where deletions are located.