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

patchbomb: add user agent header to mails

help: document stripdir template filter

templatefilters: add new stripdir filter Adds a new template filter for removing directory levels from a string. Examples: {foo|stripdir} -> 'foo' {foo/bar|stripdir} -> 'foo' {foo/bar/more|stripdir} -> 'foo/bar' {foo/bar/more|stripdir|stripdir} -> 'foo'

context: use Python 2.4 decorator syntax

localrepo: use sets in findcommonincoming

strutil: removed rsplit

notify: turned a set-like dict into a real set

revlog: let nodestotag be a set instead of a list

replace set-like dictionaries with real sets Many of the dictionaries created by dict.fromkeys were emulating sets. These can now be replaced with real sets.

util: use built-in set instead of util.unique

util: use built-in set and frozenset This drops Python 2.3 compatibility.

Merge with crew-stable

convert/bzr: fix symlink handling (issue1626)

win32text: be more careful about rejecting violating changesets We now try to walk changesets in reverse order from newest to oldest, so that if we see a file multiple times, we treat the newest version as canonical. This should prevent us from rejecting a changegroup that contains an unacceptable commit followed later by a commit that fixes the problem.

keepalive: attempt to fix issue1003 This is a reimport of the relevant piece of the upstream urlgrabber, which appears to be more correct.

test-archive: silence stupid messages from GNU tar Recent versions of GNU tar have apparently decided they're old enough that it's ok for them to prattle on senselessly about things no one cares about without anyone objecting. We object; apply duct tape.

ui: introduce new config parser

ui: simplify init, kill dupconfig

ui: fold readsections into readconfig readconfig now reads only single files readconfig takes an optional list of sections readconfig trusts files we're looking for sections in

ui: cleanup _is_trusted a bit

ui: simplify parent overlay logic

ui: always have ucdata simplify readconfig logic

ui: fold verbosity_constraints into fixconfig, simplify

ui: kill updateopts Move setconfig into dispatch._parseconfig

ui: refactor option setting No more passing options as constructor keywords. Basic options are now always stored in the overlay for simplicity and consistency.

ui: kill redundant call to verbosity_constraints

ui: always have an overlay

ui: kill check_trusted

ui: move _isatty near user

zeroconf: don't fail on non-local names

Merge with stable

Merge with crew

Merge with crew-stable

Merge with crew-stable

convert/bzr: handle files replaced by directories (issue1623)

convert/mtn: mtn does not record timezones, mark dates as UTC (issue1624)

convert/mtn: handle directory move into moved directory (issue1619/3)

convert/mtn: handle files moved in a moved directory (issue1619/2)

i18n: update Brazilian Portuguese translation - msgmerge with hg 18710802cd49 - most remaining messages translated

i18n: add Brazilian Portuguese translation

convert/svn: support more OS specific auth providers via svn 1.6 API

cmdutil: return boolean result directly in want function

util: return boolean result directly in util.binary

remove unnecessary outer parenthesis in if-statements

run-tests: fix error when timeout occurs

i18n-de: Help tests in commands.py done, still working on option description

i18n-de: More translations of commands.py (revert, status, unbundle, ...)

add a deprecation warning for gc based lock releasing

switch lock releasing in the extensions from gc to explicit

document the locking pattern in localrepo.status

switch dircleanup in mercurial.hg.clone from gc based to explicit

switch lock releasing in the core from gc to explicit

made repo locks recursive and deprecate refcounting based lock releasing all locks should use the explicit lock.release mercurial.lock.lock.__del__ handles unwrapping recursive locks localrepo.lock/wlock are still using weakref in order to keep backward compatibiltiy to releasing locks via garbage collection by ensuring the release on __del__

run-tests: fix -jN broken by 60a9e3cf0cf4

Merge with stable

Merge with crew-stable

Merge with crew-stable

Merge with crew

Merge with crew-stable

convert/mtn: handle subsecond commit dates (issue1616)

Merge with crew-stable

convert/mtn: handle new files in moved directories (issue1619) Reported and investigated by Paul Aurich <paul@darkrain42.org>

keyword: set overwrite message only once, not for each file

run-tests: removed some underscores (coding style)

run-tests: upper-case global PYTHON variable

run-tests: reduce global variables set by parse_args().

run-tests: factor out main(); reduce use of globals a bit.

run-tests: move bits of main program so it's all at the bottom.

run-tests: move _hgpath() up so it's not in the middle of the main program.

run-tests: factor out parse_args(). Clarify use of globals a bit.

patch, i18n: avoid parameterized plural

keyword, i18n: avoid untranslated strings as message parameters

commands, i18n: avoid untranslated strings as message parameters

bookmarks: fix typo

convert: fix typo

i18n: the message should not contain '\r' reported by bardy <bardiku@gmail.com>

Add comment about this test failing under bzr 1.13 due to a bug in bzr.

test-highlight: adapt output to latest pygments keeping backwards compatibility

merge with stable

issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

cvsps: make debugging easier by adding __repr__() methods.

cvsps: update docstring for changeset class.

merge with crew

manifest: improve error message about newlines in filenames Include the offending filenames in the error message. Now this error message is consistent with the same error issued by dirstate.py (although there is still duplicate code).

help texts: write command line switches as -a/--abc

Update qimport help explaining how to read a patch from stdin (Issue371)

convert: Improved svn source detection.

strip: make repair.strip transactional to avoid repository corruption Uses a transaction instance from the local repository to journal the truncation of revlog files, such that if a strip only partially completes, hg recover will be able to finish the truncate of all the files. The potential unbundling of changes that have been backed up to be restored later will, in case of an error, have to be unbundled manually. The difference is that it will be possible to recover the repository state so the unbundle can actually succeed.

transaction: support multiple, separate transactions Solves that committed (closed) transactions may linger and be returned on subsequent transaction calls, even though a new transaction should be made, rather than a new nested transaction. This also fixes a race condition with the use of weakref.

transaction: only delete journal on successful abort/commit This solves that the journal file was always deleted when the transaction was deleted, no matter whether the abort (rollback) succeeded or not. Thus, never supporting a hg recover. The journal file is now only deleted on close (commit) or a successful abort.