This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3893

ui: make the large file warning limit fully configurable
ClosedPublic

Authored by joerg.sonnenberger on Jul 6 2018, 11:57 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa936d1368fc5: ui: make the large file warning limit fully configurable
Summary

While add --large can be used to override it selectively, often enough
the user simply doesn't care about machines with less than 100MB RAM or
so, so make it possible to just specify a larger limit in hgrc.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

yuja added a subscriber: yuja.Jul 6 2018, 10:51 PM

The idea looks good.

While add --large can be used to override it selectively, often enough
the user simply doesn't care about machines with less than 100MB RAM or
so, so make it possible to just specify a larger limit in hgrc.

I think --large is the option to add a file as largefile of the largefiles
extension.

  • if st.st_size > 10000000:

+ limit = ui.config('ui', 'largefilelimit')
+ if limit != 0 and st.st_size > limit:

ui.config() returns a string. Perhaps ui.configbytes() can be used
instead.

Can you add tests for limit=0 and st_size <= limit?

av6 added a subscriber: av6.Jul 7 2018, 2:39 AM
av6 added inline comments.
mercurial/configitems.py
1080

Suggestion: large-file-limit. https://www.mercurial-scm.org/wiki/UIGuideline#naming_config_options

Closed by commit rHGa936d1368fc5: ui: make the large file warning limit fully configurable (authored by joerg.sonnenberger). · Explain WhyJul 9 2018, 8:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9469

mercurial/configitems.py

default=None, default=None,
) )
coreconfigitem('ui', 'interface', coreconfigitem('ui', 'interface',
default=None, default=None,
) )
coreconfigitem('ui', 'interface.chunkselector', coreconfigitem('ui', 'interface.chunkselector',
default=None, default=None,
) )
coreconfigitem('ui', 'large-file-limit',
av6Unsubmitted
Not Done

Suggestion: large-file-limit. https://www.mercurial-scm.org/wiki/UIGuideline#naming_config_options

av6: Suggestion: `large-file-limit`. https://www.mercurial-scm.
default=10000000,
)
coreconfigitem('ui', 'logblockedtimes', coreconfigitem('ui', 'logblockedtimes',
default=False, default=False,
) )
coreconfigitem('ui', 'logtemplate', coreconfigitem('ui', 'logtemplate',
default=None, default=None,
) )
coreconfigitem('ui', 'merge', coreconfigitem('ui', 'merge',
default=None, default=None,

mercurial/context.py

# Windows, since it contains the drive letter and colon. # Windows, since it contains the drive letter and colon.
scmutil.checkportable(ui, os.path.join(prefix, f)) scmutil.checkportable(ui, os.path.join(prefix, f))
try: try:
st = lstat(f) st = lstat(f)
except OSError: except OSError:
ui.warn(_("%s does not exist!\n") % uipath(f)) ui.warn(_("%s does not exist!\n") % uipath(f))
rejected.append(f) rejected.append(f)
continue continue
if st.st_size > 10000000: limit = ui.configbytes('ui', 'large-file-limit')
if limit != 0 and st.st_size > limit:
ui.warn(_("%s: up to %d MB of RAM may be required " ui.warn(_("%s: up to %d MB of RAM may be required "
"to manage this file\n" "to manage this file\n"
"(use 'hg revert %s' to cancel the " "(use 'hg revert %s' to cancel the "
"pending addition)\n") "pending addition)\n")
% (f, 3 * st.st_size // 1000000, uipath(f))) % (f, 3 * st.st_size // 1000000, uipath(f)))
if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
ui.warn(_("%s not added: only files and symlinks " ui.warn(_("%s not added: only files and symlinks "
"supported currently\n") % uipath(f)) "supported currently\n") % uipath(f))

mercurial/help/config.txt

Select the default interface for interactive features (default: text). Select the default interface for interactive features (default: text).
Possible values are 'text' and 'curses'. Possible values are 'text' and 'curses'.
``interface.chunkselector`` ``interface.chunkselector``
Select the interface for change recording (e.g. :hg:`commit -i`). Select the interface for change recording (e.g. :hg:`commit -i`).
Possible values are 'text' and 'curses'. Possible values are 'text' and 'curses'.
This config overrides the interface specified by ui.interface. This config overrides the interface specified by ui.interface.
``large-file-limit``
Largest file size that gives no memory use warning.
Possible values are integers or 0 to disable the check.
(default: 10000000)
``logtemplate`` ``logtemplate``
Template string for commands that print changesets. Template string for commands that print changesets.
``merge`` ``merge``
The conflict resolution program to use during a manual merge. The conflict resolution program to use during a manual merge.
For more information on merge tools see :hg:`help merge-tools`. For more information on merge tools see :hg:`help merge-tools`.
For configuring merge tools see the ``[merge-tools]`` section. For configuring merge tools see the ``[merge-tools]`` section.

tests/test-largefiles.t

$ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
$ hg add --normal --large new-largefile $ hg add --normal --large new-largefile
abort: --normal cannot be used with --large abort: --normal cannot be used with --large
[255] [255]
$ hg add --normal new-largefile $ hg add --normal new-largefile
new-largefile: up to 69 MB of RAM may be required to manage this file new-largefile: up to 69 MB of RAM may be required to manage this file
(use 'hg revert new-largefile' to cancel the pending addition) (use 'hg revert new-largefile' to cancel the pending addition)
$ hg revert new-largefile
$ hg --config ui.large-file-limit=22M add --normal new-largefile
Test explicit commit of switch between normal and largefile - make sure both Test explicit commit of switch between normal and largefile - make sure both
the add and the remove is committed. the add and the remove is committed.
$ hg up -qC $ hg up -qC
$ hg forget normal3 large4-renamed $ hg forget normal3 large4-renamed
$ hg add --large normal3 $ hg add --large normal3
$ hg add large4-renamed $ hg add large4-renamed