ui: ui.copy() now takes the ui class into account Helps subclassing by other API users.

whitespace cleanup

templater: separate template management and actual string processing

tests: add tests for styled hgwebdir pages

hgweb: use new sessionvars code in hgwebdir, too

hgweb: some cleanups in hgwebdir, remove double defaults Removed obsolete command, expose useful cleannames function.

convert/svn: fix pathname parsing from URL under Windows

hghave: handle Windows raising on popen() failure

test-extdiff: replace shell script with python for portability

Declare bzr TERM=dumb to silence progress bars In theory, one could set BZR_PROGRESS_BAR=none but it does not work in 1.14rc2

replace various uses of list.reverse()

replace util.sort with sorted built-in This is marginally faster for small and moderately-sized lists

ui: make interactive a method

util: take propertycache from context.py

ui: print_exc() -> traceback()

ui: traceback -> _traceback

ui: report_untrusted fixes - report_untrusted -> _reportuntrusted - only report config shadows if enabled - config shadows are debug messages

ui: privatize cdata vars

ui: buffers -> _buffers

ui: trusted_users -> _trustusers, trusted_groups -> _trustgroups

ui: assumetrusted -> trust

ui: _get_cdata -> _data

config: getsource -> source

ui: simplify fixconfig

ui: fix-up and warn about deprecated %%

bugzilla: fix section reading

templater: use new config parser This gives us the ability to use includes and continuations

config: add section filter to read move section filtering out of ui.readconfig kill section filtering in config.update

config: deal with spaces at end of line more carefully

hgweb: kill parentui references

ui: kill most users of parentui name and arg, replace with .copy()

ui: replace parentui mechanism with repo.baseui

add cmdutil.remoteui remoteui sorts out the issues of getting ssh config options from the local repo into the remote one while not copying other options like hooks.

ui: less links to parentui

config: add some helper methods

config: split source data out into separate map

config: add %unset name support

config: allow including other config files

showconfig: show source file and line with --debug

util: kill configparser wrapper

hgweb: use config.config

clone: config escaping no longer needed

Merge with stable

Merge with crew-stable

transplant: forbid transplant to nonempty repositories with no working directory. Partially undoes d3fb413667e5.

ui.isatty() accesses sys.stdin, causing mod_wsgi to throw IOError.

hg: allow hg.parseurl(url, None) In many places hg.parseurl is called with a url and "opts.get('rev')", suggesting the second, optional argument can be None. Because opts['rev'] usually defaults to [] this never happens in practice. However, extensions don't necessarily behave the same, but do copy this pattern. Also, include wider hg.parseurl tests, beyond a demonstration of the problem.

transplant: remove the restriction that the destination be nonempty. Test fixed by Patrick Mezard <pmezard@gmail.com>

Fix subversion convert not detecting empty changesets. Need to check for the empty as list as well as None.

cvsps: fix crash when log message refers to non-existent branch (issue1615).

cvsps: add test for merge detection (issue1615). Currently only testing convert.cvsps.mergefrom; this script should also probably test convert.cvsps.mergeto.

convert/cvs: add an option to disable remote log caching Useful for debugging or testing when using --tmpdir.

tests: removed redundant "-u test" from test scripts The tests are executed with a .hgrc file which adds "-u test" by default.

tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default.

Merge with crew-stable

convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

verify: combine sets instead of concatenating lists

rebase, revlog: use set(x) instead of set(x.keys()) The latter is both unnecessary and slower.

monoblue: Fix indentation and other styling in the annotation view.

run-tests: cosmetics