hgweb: Apply the new method of passing session variables to links.

hgweb: Keep session variables (currently only style) in HTML forms, too. Adjusted default and gitweb template for this.

templater: Better exception for errors in foo%bar formatting.

nodesbetween: fix a bug with duplicate heads

hgweb: trap lookup errors

Add better error message for bad commands

gitweb: Add error text to error page

gitweb: fix link on file name in filenodelink

gitweb: fix last change field in summary

Merge with main

Merge with crew

make manifest-merging test reproduceable

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

gitweb: add file diff view

merge with crew

update ui.quiet/verbose/debug/interactive every time the config changes - ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata settings - the quiet, verbose, debug and interactive options from the [ui] section from .hg/hgrc files are respected for commands that open the repo - setting ui.quiet/verbose/debug/interactive with --config works - the command line options always override the hgrc settings - previously it wasn't possible to override a [ui] debug = True. --debug still takes precedence over --quiet and --verbose.

ui.py: untangle updateopts The code in ui.updateopts that handles ui.quiet, ui.verbose and ui.debugflag is too smart, making it somewhat hard to see what are the exact constraints placed on the values of these variables, hiding some buglets. This patch makes these constraints more explicit, fixing these buglets and changing the behaviour slightly. It also adds a test to make sure things work as expected in the future. The buglets: - setting ui.debug = True in a hgrc wouldn't turn on verbose mode - additionally, setting ui.quiet = True or using --quiet would give you a "quiet debug" mode. The behaviour change: - previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e. the final result would be quiet mode), but --verbose wins against --quiet - now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet. As a consequence, using -qv always gives you normal mode (unless debug mode was turned on somewhere)

call ui.updateopts only after changing directories This corrects --config paths.foo=bar when it's used with --cwd

ui.py: normalize settings every time the configuration changes Previously, we would normalize settings (e.g. turn relative paths into absolute ones) only after reading a config file. Now "--config paths.foo=bar" will use the cwd to make "bar" an absolute path.

move the parsing of --config options to commands.py

ui.py: use the overlay to hold --config data This allows the ui class to know that these items have a higher priority without further help from commands.py.

ui.py: change the overlay from a dict to a SafeConfigParser. This also fixes what's probably a bug - configitems was ignoring the overlay.

ui.py: don't query parentui.cdata when looking up config items. We copied the contents of parentui.cdata on initialization.

ui.py: make walkconfig use configitems Also make it sort the available config sections while we're at it.

ui.py: move common code out of config and configbool

ui.py: remove revlogopts and (unused) diffcache variables This should make the [revlog] section in a .hg/hgrc file be respected when there's still no changelog.

ui.py: don't let parent and child ui objects share header and prev_header

ui.py: use correct parentui while copying readhooks

changectx: search manifest delta for filenode

context: check self.__dict__ instead of using hasattr hasattr implicitly calls getattr, instantiating the field it is checking for.