churn: improve description Thanks to Martin Geisler and timeless for the suggested improvements.

doc: fix regexp for determining the man page section Preceding a .* pattern with an other dot serves little purpose, better anchor the regexp to the start of the file name.

Fix test-convert-cvsnt-mergepoints so it works reliably. Specifically, always run 'cvs commit' with -f option to force commit; add one strategic sleep which seems to be necessary for post-merge clobber-and-commit (-f doesn't force a commit there?).

test-convert-cvsnt-mergepoints: make it work on OS X. - don't create file 'cvs' where directory 'CVS' already exists

test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12. - factor out cvsci function (similar to other test-convert-cvs* scripts) - add filterpath function (also similar to other scripts) - generally munge the output of CVS - add lots of output to make it easier to follow when things go wrong This doesn't make the test pass reliably under CVS 1.11; it just makes it behave the same as under CVS 1.12, i.e. sometimes it passes and sometimes it fails. Failure is more frequent with faster hardware.

Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output

Fixed patch.eol bug that truncated all patched lines to one character Also updated the import-eol test to test with lines longer than one character, and also empty lines.

subrepo: add a test

subrepo: basic push support

subrepo: add update/merge logic

commit: recurse into subrepositories

subrepo: introduce basic state parsing

Make mq, record and transplant honor patch.eol

Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.

gpg: add test

gpg: unbreak 02a12835b17e. We need a test.

share: allow dest to default to the basename of source

Merge with crew

bisect: improve --command output - Display tested revisions without --verbose - Display revision number

dirstate: fix typo introduced by 3507f6c7715c

test-bisect: test --command option

bisect: fix traceback when command executable is not found

share: add experimental share extension

add helper function to create shared repos

repo: add internal support for sharing store directories set .hg/sharedpath to point to the .hg to share with

remoteui: properly create dst with copy()

repo: set up ui and extensions earlier

localrepo: remove 'closed' argument to heads(...) function - repository heads are not associated with the closed attribute, so remove it making the code in line with the concept. - Fix functions that were calling heads with the parameter. - Adjust webcommands.branches to include the concept of inactive as well as open and closed branches - Fix code and docstrings in commands to make the correct use of closed branches & branch heads clearer - Improve grammar of 'hg heads' help text (2nd submission) this does not alter the cli for hg branches, that work is still to be done

mq: eliminate warning on qpush with empty series Warning was "DeprecationWarning: use lock.release instead of del lock"

inotify: repowatcher: don't use a watches attribute to count watches The encapsulated watcher alread has a __len__ method for this purpose. Also, repowatcher.watches was never decremented on watch deletions.

inotify: put the "while True: poll()" loop in pollable class

inotify: refactor (un)register methods into pollable object repowatcher.master becomes unnecessary

inotify.server: the decorator eventaction() shouldn't be a method of repowatcher

inotify: add log config option redirect inotify server output to a file

cmdutil: service: logfile option to redirect stdout & stderr in a file

inotify: raise QueryFailed when the server crash When the server crashes, it does not write back on the socket. The message which is then read from the socket is '', which raises a TypeError. Catching TypeError to raise QueryFailed instead.

inotify: server: move split() out of server split() has nothing to do with the server logic, it does not need to be in the class. Move it on top, next to join() which does the opposite.

inotify: remove unused variables

atomictempfile: fix exception in __del__ if mktempcopy fails (self._fp is None) Make what is going on more obvious by explicitely getting the 'closed' attribute from _fp, instead of from the gettatr proxy.

Merge with crew-stable

bzr convert: restore paths to source encoding. Closes issue1692.

doc: wrap man pages after fixing quoting

hgrc.5: fix quoting of literal strings The quotes would go wrong in many places due to differences between asciidoc version 8.2.7 used by Benoit and 8.4.5 used by me. Between those versions asciidoc stopped interpreting the content of `quoted strings`, and so `*` would start bold text in the old version, but do nothing in the new version. To complicate things further, `\*` would escape the bold tag in the old version, but in the new version the backslash was inserted literally into the output (because the backtick quotes it). I've now replaced backticks with non-quoting plusses and escaped backslashes as appropriate.

hgignore.5: remove extra quotes The so-called "unconstrained quotes" didn't really work, so I reverted them to normal quotes. Tested with asciidoc version 8.2.7 and 8.4.5.

Improve English for help text of many core hg commands. co-author: Greg Ward <greg-hg@gerg.ca>

use new style classes

doc: correctly escape *

doc: correctly escape *

hg.1: highlight references to commands and man pages

hg.1: simplify synopsis Now that arguments can be mixed with options we can simplify the synopsis considerably. Also, highlighting the command name in bold (instead of italics) seem to be the standard convention.

hgrc.5: spell check

man pages: add meta data This removes the fixme's that were otherwise inserted.

man pages: updated copyright years

hgrc.5: use NOTE admonition paragraph

hgrc.5: reformatted to avoid big chunks of monospaced text The man page used to have lines longer than 80 characters, even though all lines in the hgrc.5.txt file were wrapped nicely. The problem turned out to be that the indented paragraphs started literal blocks instead of normal paragraphs. The literal blocks were of course not wrapped when displayed by man. In short, the asciidoc rules require lists to be formatted like this: foo:: Some description of foo. + Another paragraph in the description of foo. It *must* start flush left and the plus is necessary to indicate that this is a list item continuation. Lists with nested lists can be formatted correctly using something called "open blocks". These blocks are used to group the list items and are marked by a line above and below with two dashes. See the asciidoc user guide for the gory details...

hgrc.5: mark filename patterns as monospaced text

hgrc.5: single quotes means italic in asciidoc Use double quotes instead and mark the * as monospaced text.

man pages: mark filenames and env vars as fixed text

test-convert-svn-*: no longer need the url building code

convert: default to file protocol when no :// found for svn repo url Edited by pmezard: add path separator normalization

keyword: improve English

bookmarks: improve English

Generally replace "file name" with "filename" in help and comments.

Spell Mercurial as a proper noun

win32text: drop disabling portion of test disabling extension leaves dirstate confused about whether affected files are clean or not, not much point testing it.

i18n-de: Synchronised with hg.pot translated by Fabian Kreutz <fabian.kreutz@qvantel.com> Tobias Bell <tobias.bell@gmail.com>

i18n-pt_BR: synchronized and updated - synchronized with hg 6019e6517f95 - translated remaining messages - many spelling and formatting fixes

convert: better support for CVS branchpoints (issue1447) This records the branches starting at individual CVS file revisions, using the symbolic names map rather than just the branches information. This information is used to generate Mercurial changesets. Despite the changes, the CVS conversion still suffers heavily from cvsps' deficiencies in generating a correct representation of the CVS repository history.

Merge with stable

Merge with crew

merge: refactor manifestmerge init to better report effective ancestor

merge: simplify file revision comparison logic

merge: make locally-added file test more correct

merge: drop unused diverge initialization

merge: refactor some initialization, drop backwards var

merge: combine a copy and move case

merge: drop a flag update case

merge: combine three identical 'remote is newer' cases

merge: drop 'remote deleted' case

merge: simplify 'other deleted' case

merge: simplify backwards revert test, ready to combine with other cases

merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right?

merge: reorder remote creation tests

merge: drop recreating case

merge: drop an overwrite test

merge: simplify a delete case

merge: reorder get cases for future simplification

merge: fix prompt keep

merge: remove a flags case

merge: pretend ancestor is local to simplify backwards and overwrite

merge: simplify flag merging code slightly

dirstate: eliminate reference cycle from normalize Bound methods hold a reference to self, so assigning a bound method to an instance unavoidably creates a cycle. Work around this by choosing a normalize method at walk time instead. Eliminate default arg while we're at it.

cleanup: removed unused imports

hgrc.5: wrap lines at 70 chars (whitespace cleanup)

hgignore.5: wrap lines at 70 chars (whitespace cleanup)

hg.1: wrap lines at 70 chars (whitespace cleanup)

hgrc.5: language fixes

hgrc.5: wrap manpage at 80 chars Checked with asciidoc 8.4.5

bookmarks: update docstring

Unbreak run-tests support for out-of-tree extensions

Merge with crew-stable

Some platforms lack the PATH_MAX definition (eg. GNU/Hurd). Thanks to ronny for making it cleaner.

test-fncache: Use find instead of ls -R. Different platforms implement -R differently (and it produces unneccessarily verbose output in this case). find is just as good and more consistent. Unbreaks test on OpenBSD. Edited by pmezard: added 'sort' call

Make test-verify SUSv3 compatible. 'head -c' isn't supported on (at least) OpenBSD and is not part of SUSv3. Instead, use dd. See also: http://www.opengroup.org/onlinepubs/009695399/utilities/head.html

Support branch names in contrib/bash_completion Anywhere a revision is needed a branch name can be used to specify the tip of that branch, so branch names should be tab completed.

Support merge in contrib/bash_completion

context: add a dirty method to detect modified contexts

dirstate: don't complain about 0-length files

commit: move some setup outside the lock

Add cp950 as problematic encoding which is used in chinese windows.

hgweb: allow distinction between open/closed branches on branches page

commit: rename wctx to cctx

mq: fix commit prototype

commit: trade O(n^2) file checks for O(n^2) dir checks

commit: move explicit file checking into repo.commit

dirstate: more accurate use of match.dir callback

commit: editor reads file lists from provided context

commit: drop the now-unused files parameter

tag: use match.exact for commit

commands: drop files arg for commit calls