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

cmdutils: Take over glob expansion duties from util

match: fix _patsplit breakage with drive letters

statichttprepo: handle remote not supporting Range headers - If remote does not support Range header, 200 is answered instead of 206. The HTTPRangeHandler left these responses unchanged, so the data has to be sliced by the receiver. - httprangereader file pointer was not updated.

convert: better feedback when filtering out empty revisions Original patch by Herbert Griebel <herbertg@gmx.at>

inotify: server: use a common 'pollable' interface for server & repowatcher Mainly for documentation purposes: it easily explains the role of handle_event and handle_timeout, and why both server & repowatcher implement those methods.

inotify: process all inotify events in one batch When several inotify events happen, we don't have to process each event separately, calling everytime repowatcher.read_events() to fetch events from the underlying watcher: it is sufficient to call once read_events, to fetch all the events from the watcher.

inotify: rename handle_event to handle_pollevent to avoid confusion event here refers to poll events, and are different from events read in server.read_events for example, where those events are inotify events.

inotify: handle_event: do not use event and fd parameters. event is particularly confusing given the context (is it an inotify event? a polling event?) and is never used. Remove it. fd has very little use, and it gives the false impression that event handling depends on fd. It's wrong: the same behavior is triggered, for all events.

inotify: use a decorator instead of dispatching calls

inotify: do not defer inotify events processing Doing a part of the event processing and deferring the rest is a bad habit: it complexifies the code, and it does not respect event ordering! Moreover, there is already a timeout handling, so that inotify events are only processed when a treshold is exceeded: there is no requirement to delay anymore the events processing.

inotify: do not recurse in handle_timeout(): call it explicitely, not in scan() When in handle_timeout, scan() is called when a repertory is created/modified. But the first line of scan calls handle_timeout. This had the consequence of calling recursively handle_timeout: * several calls to read_events (but only the first one retrieves events) * every time that an event is queued for a deferred action, the next time that scan() is called, handle_timeout is called, the event queue is treated, even if all the events haven't been read/queued yet. This could lead to inconsistencies

i18n-da: typo

merge with crew

inotify: adding test for issue1556