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

transplant: use match object rather than files for commit

rebase: remove unneeded status call before commit

gpg: use match.exact rather than files for commit

mq: drop unneeded files args for commit

commit: apply force flag without files

fetch: no need to pass files list to commit

templater: retain author's full name if no email is supplied (issue1685)

tests: delete parallel coverage files after combining

heads: show closed heads only when --closed is passed Add a --closed (-c) option to 'hg heads' to show all heads and change the default behavior to refrain from showing fully closed branches. Enhance 'hg heads <branch>' so that: * default: displays normal & inactive heads, not closed heads * --closed: displays normal, inactive & closed heads * --active: displays only normal heads * both --closed and --active: displays normal & closed heads only

localrepo: set heads and branchheads to be closed=False by default The heads(...) and branchheads(...) functions will now only return closed heads when explicitly asked for them. This will cause 'hg merge' to have better behavior in the presence of a branch that has closed heads when no explicit rev is passed.

convert: rewrite tags when converting from hg to hg

convert: default revisions order depends on source When converting Mercurial repositories you expect the revision numbers to be preserved, while other sources conversions focus on efficiency.

convert: fail fast if source does not support --sourcesort

convert: add --sourcesort option for source specific sort Only supported by Mercurial source for now.

convert: parse sort mode sooner

convert: split toposort() into subfunctions for readability

run-tests: don't replace PYTHONPATH, just augment it. (Needed at least for Subversion bindings on OS X, which are in /opt/subversion. Useful for other external libraries installed in non-standard places too.)

merge with mpm

color: yet another typo

match: fold plan cases down to two special cases - merge always and match with patterns - make always and match with patterns the default - invert dostep3 to skipstep3 - move dirignore test inside exact case

walk: refactor walk plan - never is gone - reorder tests more cleanly - rename nomatches to exact for clearer semantics

match: remove match.never Only one user, can be translated to match.exact()

walk: use match.bad callback for filetype messages

match: ignore return of match.bad All users returned false, return can now be dropped

add: use match.bad callback more effectively

match: document bad callback semantics

walk: simplify logic for badfn clause - matchfn redundant - call badfn always rather than fwarn - use for/else rather than keep var

walk: we always have a badfn

walk: simplify check for missing file

run-tests: redefine --with-hg so it takes the 'hg' script to run. - in parseargs(), check that --with-hg value is valid - add handy --local option for "--with-hg=../hg" - ensure that we always set PATH and PYTHONPATH (not just when doing a temporary install) - override any existing PYTHONPATH, so test success does not depend on whatever happens to be in the caller's environment - give tests a little more control by exporting $PYTHON to the environment; needed by test-convert and test-mergetool when they run hg with a stripped-down $PATH Also, add a big comment explaining all the corner cases to test for the next person who tries to modify this script.

run-tests: fix _checkhglib() so it's correct when using --with-hg. Since this makes the warning less likely, upgrade it to a "real" warning to stderr.

run-tests: factor out _checkhglib() to check import path of 'mercurial'. - rename _hgpath() to _gethgpath() and move it down next to _checkhglib() - change _gethgpath() so it caches its result: replaces global 'hgpkg' that anyone can use with global '_hgpath' that is only for _gethgpath() - no need to pass 'expecthg' to runchildren() or runtests() anymore Also: do not change global PYTHON when doing coverage; this seems to be unnecessary, since we create a dummy 'hg' script that handles coverage for us, and it made things brittle. (E.g. the rest of this patch makes the call to _hgpath() come later, and it was broken by enabling coverage.)

run-tests: show PID if running in parallel mode with -v. (Extremely handy when you break parallel operation and need to figure out what's going on. The assumption is that if you run with -v, you want more details.)

i18n-da: synchronized and updated slightly

commands: typo in bundle abort message This error trigger if one calls bundle with the wrong parameters and it is thus not an error scripts will want to look for (they could and should ensure that they call bundle with the correct parameters).

fixed typos found in translatable strings This is from a spell-check of hg.pot.

graphlog, win32mbcs: capitalize ASCII

highlight: consistently capitalize Pygments

win32mbcs: capitalize Unicode

commands: expand "arg" -> "argument" in showconfig help strings It is easier to translate full sentences without abbreviations, or said differently, I don't know a short Danish word for "argument".

wrap string literals in error messages

convert/gnuarch: wrap long line, format kwargs without spaces

convert/cvsps: wrap long lines

convert/subversion: wrap long lines in comments

test-hybridencode: break long string literals

revlog: make triple-quoted string a real comment

posix: do not use fstat in isowner The fstat function was undefined, but never used since a stat object was always passed in the optional st argument. Passing st is now mandatory. This bug crept in when util was split up into posix and windows modules. The fstat function is still defined in util, but importing it into posix would create an import cycle which seems unnecessary.

removed unused imports

Move alias into core

mq: rename setheader to updateheader and fix comment

mq: initializing patchheader class directly from patch content The patch header needs only be read in order to instantiate the class, and as such it makes more sense to do it within the class.

Merge with mpm

run-tests: clarify timeout log message.

revlog: refactor chunk cache interface again - chunk to _chunk - _prime to _chunkraw - _chunkclear for cache clearing - _chunk calls _chunkraw - clean up _prime a bit - simplify users in revision and checkinlinesize - drop file descriptor passing (we're better off opening fds lazily

clone: fall back to pull source repo cannot be locked, 937ee88da3ef was a noop 937ee88da3ef was a noop, it was missing the wait keyword

fixed 0xc0150004 error building Mercurial under Python 2.6 for Windows

localrepo: move comment

localrepo: use lock.release for single lock

dirstate: fixed typo in comment

changelog: make delayopener less intrusive

revlog: report indexfile rather than datafile for integrity check

ui: fix two bugs in %% warning

revlog: move stat inside lazyparser

dirstate: notice truncated parents read

lookup: check for dirstate damage on failure

keyword: rename matcher() to match() mimicking changes in main

tests: test for dispatch on [defaults]: more clearly differing output Using '-r null' instead of '-v' as the overriden command default. The latter did not have any effect on output, thus not giving much indication on whether the modified defaults were really in use or not.

merge: whitespace cleanup

revlog: add test for 7659eecd9da2 (issue1678)

changegroup: the node list might be an empty generator (fix issue1678)

store encoding: .i/.d encoding for non-store repo (broken by 810387f59696)

replace "i in range(len(xs))" with "i, x in enumerate(xs)" The remaining occurrences should be the ones where "xs" is mutated or where "i" is used for index arithmetic.

util: simplify range expression The n index variable was unused. Every iteration would pop one element off of parts, so the for loop can be replaced with a while loop.

color: cleanup extra commas

setup: execute hg in C locale

setup: handle trust warnings when determining version

setup: renamed l, e vars to out, err

hggettext: ensure correct Mercurial is imported

Makefile: do not create i18n/, it is already there

replace xrange(0, n) with xrange(n)

color: replace re.split with ui.configlist

color: use lists instead of tuples for effects

hgweb: extract config values after reading webdir-config

tests: make coverage run in parallel mode, clean up coverage code

revlog: fix undefined variable introduced in 5726bb290bfe

parentrevspec: remove a trailing colon

purge: fix spelling error

zsh-comp: explain how to use for non-global install

use ui instead of repo.ui when the former is in scope