dirstate: drop all logic around the "non-normal" sets
The dirstate has a lot of code to compute a set of all "non-normal" and
"from_other_parent" entries.
This is all used in one, unique, location, when `setparent` is called and moved
from a merge to a non merge. At that time, any "merge related" information has
to be dropped. This is mostly useful for command like `graft` or `shelve` that
move to a single-parent state -before- the commit. Otherwise the commit will
already have removed all traces of the merge information in the dirstate (e.g.
for a regular merges).
The bookkeeping for these sets is quite invasive. And it seems simpler to just
drop it and do the full computation in the single location where we actually
use it (since we have to do the computation at least once anyway).
This simplify the code a lot, and clarify why this kind of computation is
needed.
The possible drawback compared to the previous code are:
- if the operation happens in a loop, we will end up doing it multiple time,
- the C code to detect entry of interest have been dropped, for now. It will be
re-introduced later, with a processing code directly in C for even faster
operation.
Differential Revision: https://phab.mercurial-scm.org/D11507
# pager.py - display output using a pager
#
# Copyright 2008 David Soria Parra <dsp@php.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
#
# To load the extension, add it to your configuration file:
#
# [extension]
# pager =
#
# Run 'hg help pager' to get info on configuration.
'''browse command output with an external pager (DEPRECATED)
Forcibly enable paging for individual commands that don't typically
request pagination with the attend-<command> option. This setting
takes precedence over ignore options and defaults::
[pager]
attend-cat = false
'''
from __future__ import absolute_import
from mercurial import (
cmdutil,
commands,
dispatch,
extensions,
registrar,
)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = b'ships-with-hg-core'
configtable = {}
configitem = registrar.configitem(configtable)
configitem(
b'pager',
b'attend',
default=lambda: attended,
)
def uisetup(ui):
def pagecmd(orig, ui, options, cmd, cmdfunc):
auto = options[b'pager'] == b'auto'
if auto and not ui.pageractive:
usepager = False
attend = ui.configlist(b'pager', b'attend')
ignore = ui.configlist(b'pager', b'ignore')
cmds, _ = cmdutil.findcmd(cmd, commands.table)
for cmd in cmds:
var = b'attend-%s' % cmd
if ui.config(b'pager', var, None):
usepager = ui.configbool(b'pager', var, True)
break
if cmd in attend or (cmd not in ignore and not attend):
usepager = True
break
if usepager:
# Slight hack: the attend list is supposed to override
# the ignore list for the pager extension, but the
# core code doesn't know about attend, so we have to
# lobotomize the ignore list so that the extension's
# behavior is preserved.
ui.setconfig(b'pager', b'ignore', b'', b'pager')
ui.pager(b'extension-via-attend-' + cmd)
else:
ui.disablepager()
return orig(ui, options, cmd, cmdfunc)
extensions.wrapfunction(dispatch, b'_runcommand', pagecmd)
attended = [b'annotate', b'cat', b'diff', b'export', b'glog', b'log', b'qdiff']