dirstate: make filterfiles private

dirstate: add __contains__ and make __getitem__ more useful dirstate.state(f) == '?' -> f not in dirstate dirstate.state(f) -> dirstate[f]

dirstate: make wjoin function private

dirstate: break update into separate functions

dirstate: use True and false for _dirty

test-alias: Removed fallback to parentui, no longer needed since 10afa3fab6b4

merge with crew-stable

Make [defaults] in .hg/hgrc work.

fix bogus close spotted by pychecker (no close() in global scope)

Remove unused pprint import and the commented line which used it before.

Use format string for lockname again (was changed by 3e25a6eb5c9a)

Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. I have tried Debian's default emacs and the current CVS version. Default emacs doesn't have highlighting enabled (and being emacs-illiterate I don't know how to enable it) and the CVS emacs' Python highlighting has no problems with ' characters here.

removed trailing whitespace

fix unused variables reported by pychecker

churn: get current terminal width if possible

merge with crew-stable

dirstate.invalidate: avoid rebuilding _map Since hasattr will call __getattr__, the call to hasattr(self, '_dirs') will end up reparsing the dirstate file.

add dirstate._dirtypl variable Theoretically, it's possible to forget modified dirstate parents by doing: dirstate.invalidate() dirstate.setparents(p1, p2) dirstate._map The final access to _map should call _read(), which will unconditionally overwrite dirstate._pl. This doesn't actually happen right now because invalidate accidentally ends up rebuilding dirstate._map.

archive: delay extraction of file revisions This allows us to look only at the filelogs we're interested in, providing a nice speedup if we're archiving only part of a repository.

help: avoid traceback if an extension has only debug commands

convert/subversion: rehandle the no-tags case

Print meaningful error message if os.symlink fails

lock.py: cache hostname, but not pid, in case we fork

convert/subversion: work around memory leak in svn's python bindings The svn.ra.get_log wrapper attaches the hash of changed paths for every log entry to a global memory pool, so memory consumption increases rapidly, with no way to free it. Our workaround is to call this function in a child process, and feed its results back over a pipe. The memory consumption of the child still grows huge (hundreds of megabytes), but at least it goes away once the reading-the-log phase is done.

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion: Simplify callback.

merge with crew-stable

Simplify update.

Better fix for issue 622 than we had in c4dd58af0fc8.

convert/subversion: reduce memory usage by filtering early This makes up to a 50% difference in memory consumption.

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion: get converter working against plain HTTP.

Simplify update.

Better fix for issue 622 than we had in c4dd58af0fc8.

merge with main

doc: typo, -x bit

merge with crew-stable

fix test-tag on Solaris

tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.

issue 622: pull/unbundle -u updates to default branch if repo was empty

mq: autodetect an existing git patch during qrefresh (issue 491)

replace .hgtags instead of appending to it when doing a raw commit

handle nonexistent .hgtags in raw _tag

convert/subversion.py: str.rsplit is not available in Python 2.3

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion.py: fix bad assumptions about SVN path naming The SVN converter assumed that the trunk and branches paths were fixed, and immediately under the base of the SVN URL. Fix the second assumption, and allow the trunk and branches paths to be reconfigured.

convert/subversion.py: escape quotes to make code readable in Emacs

patch: patches should be read and written in binary mode when possible.

patch: fix normalized paths separators.

posixfile_nt: '+' was understood as read mode instead of update.

Update test output to reflect small changes in patch chattiness.

patch.py: re-add the ability to use an external patch program This is now invoked by default only if ui.patch is set. Otherwise, we use our built-in patch. If that fails because it can't find any valid hunks, we'll fall back to trying the external patch command.

patch.py: don't mark files as changed unless they have actually been changed

patch.py: fix some incorrect uses of _() for i18n

Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch

merge with crew-stable

convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.

hg parents: don't pass an OS-specific path to repo.filectx The only reason to use the matcher code instead of calling util.canonpath directly is to be able to use "path:canonical/path/to/file" patterns.

merge with main

contexts: improve filectx eq test