Improved examples for network support in README. - Simplified 'hg serve' example, -p80 needs root anyway. - Example for ssh:// with relative or absolute path. - merges need to be committed.

Corrected "waiting for lock on repository FOO held by BAR" message. BAR was the error number and not the locker name. Use repr on BAR, so problems can be detected easier.

Handle locking exceptions if streaming clone can't lock the repo. (Issue324)

Don't step into an endless loop when lock file is empty.

Issue424: mq patch loses guard when qrenamed

correct remote heads test in prepush

add docstring to reachable

reorder tests in prepush It's more useful to show the new branches message than the unsynced changes message.

fix qseries -v when there are unapplied patches

Indentation cleanups for 2956948b81f3.

fix warnings generated by pygettext.py.

Update trusted_users only after we've seen a file not owned by the user

Avoid looking up usernames if the current user owns the .hgrc file Converting uids into usernames may be somewhat expensive when NIS or LDAP is involved.

Use a variable to explicitly trust global config files

Revert almost all of 5be434785317; add a test Because of file copies, we should update the manifest dict only after committing all files.

avoid unnecessary copy merges

white space and line break cleanups

Merge with crew.

Use nullrev+count instead of count-1 in a newly introduced expression. Before that repo.changelog.tip() was used, but this yields a node. Of course many more places should be changed like this, this was just done as an example.

commands.docopy: pay attention on whether paths use "/" or os.sep

fix util.pathto All users of this function pass a local path (which uses os.sep) as the first argument and a "/"-separated path as the second argument.

don't use readline() to read branches.cache The posixfile_nt class used on windows doesn't have that method.

merge with upstream

zsh: typo in commit completion

issue228: Fix repositories at the filesystem root (/ or C:\) Thanks to Robert Shaw and other people on the list for the suggestions.

Export changelog dict in localrepo.commit

abort if explicitly committed files are not found or not tracked

unduplicate bundle writing code from httprepo

remove duplicate zgenerator in httprepo

create a readbundle function

move write_bundle to changegroup.py

remove legacy hg parents REV syntax

add log --removed

rename and copy are no longer experimental

alphabetize help_ in commands

remove relpath

refactor rawcommit

refactor debugrenamed

move show_version to version_

move walkchangerevs to cmdutils

Consolidate brinfo handling

changeset templater: convert some unnecessary yields to returns

further simplify stringify

ui: remove last vestiges of header buffering

Refactor log ui buffering and patch display

refactor header handling for changelog formatting

templates: move changeset templating bits to cmdutils

templater: changeset templater reorganization and optimizations

templater: speed up changeset writes and stringify

changeset_templater: remove changes arg

templater: simplify parsestring

template: fold template() into __call__, minor optimizations - use non-grouping operator to avoid some extra processing - avoid copying and updating defaults - unnest main template body - avoid returning extra empty string if format

templater: simplify cache and remove filter argument in __call__

templater: simplify template function

templater: take cStringIO out of indent

templater: remove cStringIO from stringify

templater: remove cStringIO for fill

templater: use str.decode in parse_string

bundle: don't use sets.Set

revlog: reachable actually takes a node

util: add copyfile function

hgweb: internalize some socket details

remove unused imports

tests: add -i switch Prompt to accept changes for tests where output changed

tests: add -R switch Restarts at first .err file if one exists, otherwise runs all tests

tests: sort test list if running all tests

Fix accessing a repository via -R/--repository through a symlink. Sometimes the repository root was compared to os.getcwd(), which always uses the canonical path without symbolic links in it. This would changes self.root of the localrepo objects to always use os.sep as the directory separator, which is implicitly assumed in some places, but may not be the case if somebody uses -R foo/repo on windows.

Merge with upstream

localrepo: factor commit and rawcommit note: rawcommit with an empty text will now launch the editor

localrepo.commit: little cleanups - use a list for new fileids - sort the removed files

Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.

Clarify untracked file merge message

Remove references to documentation that was removed in da9506fe2710

Corrected documentation for return value of python hooks.

Fixed directory name having an extra dot on "hg archive -t tbz2 foo.tbz2". Problem reported by Rob Landley.

Try hgweb unbundle methods in the order presented by the server. If no common bundle format is found, push is aborted.

Client support for hgweb unbundle with versions.

Add allowed bundle types as argument to hgweb unbundle capability. Arguments to capabilities were added before the 0.9.1 release, so there are no compatibility issues. Mercurial 0.9 didn't support http push. Using HG10GZ, HG10BZ and HG10UN has the advantage that new bundle types can be added later and the client doesn't have to try sending them first and reacting on errors sent by the server.

hgweb: remove debugging print

hgweb: introduce a new capability for sending a compressed bundle the header of the bundle is the same as a on-disk bundle HG10UN: uncompressed HG10BZ: bz2 HG10GZ: gzip no header means uncompressed (old client)

hgweb: if the server supports it, send a compressed bundle

Use httpconnection even with proxies. This should give us HTTP keepalive when we talk to proxies and should allow us to stream a file in unbundle (instead of reading everything into a string). This should fix issue376.

issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)

hgweb: split URLs containing spaces or other escaped characters correctly

zsh: perform ~ expansion on _hg_root

mq: handle qpush -a with empty series

zsh: compute repository root instead of forking hg

zsh: complete users in ssh URLS

zsh: support remote cloning

zsh: add optional remote directory cache

sshrepo: fix the parsing of the ssh url

zsh: complete SSH directories

zsh: complete unknown commands normally

merge with crew

hgweb: fix handling of path for old style template - path from old style are prefixed by '/', make cleanpath strip them - make manifest() use relative paths, that was the only function using '/' prefixed paths

merge with crew