This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6222

messages: replace some instances of "folder" by "directory"
ClosedPublic

Authored by martinvonz on Apr 10 2019, 8:50 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb63b8b7ca5fa: messages: replace some instances of "folder" by "directory"
Summary

I'm pretty sure this is our preferred term.

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 10 2019, 8:50 PM
pulkit accepted this revision.Apr 12 2019, 8:17 AM
Closed by commit rHGb63b8b7ca5fa: messages: replace some instances of "folder" by "directory" (authored by martinvonz). · Explain WhyApr 12 2019, 8:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14708

mercurial/context.py

if len(mfiles) > 0: if len(mfiles) > 0:
if len(mfiles) == 1 and mfiles[0] == path: if len(mfiles) == 1 and mfiles[0] == path:
return return
# omit the files which are deleted in current IMM wctx # omit the files which are deleted in current IMM wctx
mfiles = [m for m in mfiles if m in self] mfiles = [m for m in mfiles if m in self]
if not mfiles: if not mfiles:
return return
raise error.Abort("error: file '%s' cannot be written because " raise error.Abort("error: file '%s' cannot be written because "
" '%s/' is a folder in %s (containing %d " " '%s/' is a directory in %s (containing %d "
"entries: %s)" "entries: %s)"
% (path, path, self.p1(), len(mfiles), % (path, path, self.p1(), len(mfiles),
', '.join(mfiles))) ', '.join(mfiles)))
def write(self, path, data, flags='', **kwargs): def write(self, path, data, flags='', **kwargs):
if data is None: if data is None:
raise error.ProgrammingError("data must be non-None") raise error.ProgrammingError("data must be non-None")
self._auditconflicts(path) self._auditconflicts(path)

mercurial/debugcommands.py

ignored = p ignored = p
ignoredata = repo.dirstate._ignorefileandline(p) ignoredata = repo.dirstate._ignorefileandline(p)
break break
if ignored: if ignored:
if ignored == nf: if ignored == nf:
ui.write(_("%s is ignored\n") % uipathfn(f)) ui.write(_("%s is ignored\n") % uipathfn(f))
else: else:
ui.write(_("%s is ignored because of " ui.write(_("%s is ignored because of "
"containing folder %s\n") "containing directory %s\n")
% (uipathfn(f), ignored)) % (uipathfn(f), ignored))
ignorefile, lineno, line = ignoredata ignorefile, lineno, line = ignoredata
ui.write(_("(ignore rule in %s, line %d: '%s')\n") ui.write(_("(ignore rule in %s, line %d: '%s')\n")
% (ignorefile, lineno, line)) % (ignorefile, lineno, line))
else: else:
ui.write(_("%s is not ignored\n") % uipathfn(f)) ui.write(_("%s is not ignored\n") % uipathfn(f))
@command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts, @command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts,

tests/test-rebase-inmemory.t

$ hg rebase -r . -d 3 -n $ hg rebase -r . -d 3 -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip) rebasing 8:e147e6e3c490 "c/subdir/file.txt" (tip)
abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3. abort: error: 'c/subdir/file.txt' conflicts with file 'c' in 3.
[255] [255]
$ hg rebase -r 3 -d . -n $ hg rebase -r 3 -d . -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 3:844a7de3e617 "c" rebasing 3:844a7de3e617 "c"
abort: error: file 'c' cannot be written because 'c/' is a folder in e147e6e3c490 (containing 1 entries: c/subdir/file.txt) abort: error: file 'c' cannot be written because 'c/' is a directory in e147e6e3c490 (containing 1 entries: c/subdir/file.txt)
[255] [255]
$ cd .. $ cd ..
Test path auditing (issue5818) Test path auditing (issue5818)
$ mkdir lib_ $ mkdir lib_
$ ln -s lib_ lib $ ln -s lib_ lib