keyword: kwfiles --unknown instead of --untracked Use the same option name as "hg status". Retrieve option in _status(). Mark --untracked as deprecated.

convert: unbreak non-svn engines

zeroconf: read actual description for repos in hgwebdir

zeroconf: code cleanup, fixing variable names to be meaningful

Merge with crew

notify: make it possible to pass extra info into templates

test-gendoc: add tests for all languages This ensures that we catch errors in the reST syntax early and for all languages. The only change needed in gendoc.py was to correct the computation of section underlines for Asian languages.

gendoc: do not wrap encoded string - it breaks multi-byte characters - it is not needed since Docutils will take care of wrapping the strings as necessary

test-encoding: make test output easier to follow

Merge with crew-stable

test-extension: update test output to match a4f6e4427b65

util: do not corrupt multi-byte characters in wrap

push: fix subtle bug in prepush logic A test case demonstrating the bug has been added. Contributed by Henrik Stuart and Sune Foldager.

color: mark --no-color as deprecated (--color=never has the same effect) This should've been marked deprecated when --color was first introduced, but it was something I overlooked.

mention overlay bundle file in global --repository option see http://mercurial.selenic.com/wiki/LookingIntoBundles Drop mentioning symbolic path names for the sake of brevity. This is a common feature of path options anyway.

merge with crew-stable

localrepo: fix bugs in branchheads and add docstring - The call to reverse() reversed the list in place in the global branchmap. - The nodesbetween function doesn't preserve ordering.

convert: fix marshalling in P4 convert extension to use a binary stream The Perforce convert extension uses the p4 -G command line option and marshal.load to obtain information about the history of a Perforce depot. The method marshal.load must be provided with a binary stream (mode='rb') in order to function reliably. Certain changelist descriptions or other elements in a depot history could trigger a premature EOFError, causing the conversion process to fail. This may resolve the issue discussed in the following thread: http://www.selenic.com/pipermail/mercurial/2009-July/026813.html

merge with mpm

convert/cvs: update debugcvsps documentation

Merge with crew-stable

dispatch: catch ConfigError while constructing ui

config: abort on indented non-continuation lines (issue1829) Previously, as soon as a continuation would be met, "cont" would stay forever set to True, but "item" was set back to "None". This caused the continuation code bits to run every time, until the next "self.get(section, item) + '\n'" which would crash.

hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change.

do not attempt to translate ui.debug output

Merge with crew-stable (again) I had pulled 661bc51f09b7 into my local clone and accidentially rebased it after pulling a new changeset from crew.

win32mbcs: util.normpath should be wrapped. It is because util.normpath() finally calls windows.pconvert() which is not wrapped (by changeset:25c41ddb3978).

Merge with crew-stable

win32mbcs: util.normpath should be wrapped. It is because util.normpath() finally calls windows.pconvert() which is not wrapped (by changeset:25c41ddb3978).

test-keyword: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.

record: remove superfluous space

contrib/bash_completion: add tab completion for some bookmark commands

bookmarks: support --quiet

demandimport: blacklist gtk Demandimport breaks gtk. You get a meaningless error about 'failed loading gobject\_gobject.pyd'. Mercurial does not use gtk, but this trips up many extension writers.

convert: disable SVN support due to library license incompatibility

Merge with crew-stable

Merge with main

hg: avoid combining translated strings Combining translated string fragments into bigger strings is bad practice because it removes context from the fragments. The translator sees the fragments in isolation and might not jump back to the source to see how a string like "%d files %s" is actually used.

merge with mpm (temporarily undo qprev/qnext/qtop removal)

Merge with crew-stable

commands: expand -c and -C in update error message

commands: forbid 'hg update --check --clean'

Merge with stable

windows: provide filename in IOError exceptions This brings the Windows posixfile errors in line with the errors on other platforms.

Merge with crew

test-gendoc: test documentation generation

doc/Makefile: make rst2html and rst2man halt on warnings

doc/Makefile: do not create files in case of errors When stdout is redirected to the target file directly, the file is created as an empty file even when an error occurs. Since the file is there, 'make' wont try to re-create it in subsequent runs. This fix is similar to the one in a6747ba27d22, but it also takes care of rst2html and gendoc.py.

Merge with crew-stable

zeroconf: fix hgweb published URLs (issue1819)

win32mbcs: wrap util.pconvert, not windows.pconvert (issue1828)

Merge qprev/qnext backout

Backed out premature qprev/qnext removal

Add new flag [-1] to synopsis of qapplied/qunapplied

Improve some docstrings relating to changegroups and prepush().

improve code readability

Merge with crew-stable

test-convert-git: Use ~ instead of ^ Solaris sh interprets ^ as pipe symbol and the test thus failed in strange ways. git can however use of HEAD~ instead of HEAD^.

transplant: Add trailing LF in tmp file for filtering Transplant filtering used a tmp file ending with the (stripped) commit message and thus no final LF. Text files not ending with LF is usually not used on Unix and is thus wrong ;-) The missing LF had bad consequences because Solaris sed chokes on unterminated input lines, so echo -n foo|sed 's,o,0,g' doesn't output anything, and the filter used in tests/test-transplant thus stripped the last (and only) line in the message away on solaris.

Merge with crew-stable

convert: fix history topology when using hg.tagsbranch When using hg.tagsbranch, all conversions fail at transcribing the source repo topology with conversion scenarios interleaving: - initial repo conversion, - then upstream tag - then later incremental conversion The problem is caused by the usage of the last source revid as source revid for the tagnode in the revision map. On a later incremental conversion, when resolving some child commit of the true last source revid, convert will parent the nodes to the tag node. If using tagsbranch you get a bad topology where all incremental commit nodes end up in the tag branch. Analysis and test by Edouard Gomez <ed.gomez@free.fr>

Merge with crew-stable

merge: exclude common ancestor from --preview (issue1818)

inotify: _inotify.c: bugfix: remove_watch has to return PyNone on success We are not currently using that API function in inotify, hence the reason for the "silent" bug. But returning NULL here causes the interpreter to crash. Let's keep code clean for reusers :) The whole "bail" logic was unneeded here.

parsers.c: parse_manifest: fixing refcount of flags When flags was DECREF'ed, scope was referencing to the outer variable, outside of the block. It was in fact always NULL: the real Python object was never decref'ed.

test-highlight: remove redundant test Changeset 799373ff2554 is testing how a EUC-JP encoded Japanese file is treated in different encodings, so the ISO-8859-1 encoded German file is no longer needed.

Merge with crew-stable

highlight: fixes garbled text in non-UTF-8 environment This patch treats all files inside repository as encoded by locale's encoding when pygmentize. We can assume that most files are written in locale's encoding, but current implementation treats them as UTF-8. So there's no way to specify the encoding of files. Current implementation, db7557359636 (issue1341): 1. Convert original `text`, which is treated as UTF-8, to locale's encoding. `encoding.tolocal()` is the method to convert from internal UTF-8 to local. If original `text` is not UTF-8, e.g. Japanese EUC-JP, some characters become garbled here. 2. pygmentize, with no UnicodeDecodeError. This patch: 1. Convert original `text`, which is treated as locale's encoding, to unicode. Pygments prefers unicode object than raw str. [1]_ If original `text` is not encoded by locale's encoding, some characters become garbled here. 2. pygmentize, also with no UnicodeDecodeError :) 3. Convert unicode back to raw str, which is encoded by locale's. .. [1] http://pygments.org/docs/unicode/

Make distinct lookup error for localrepo.lookup This allows clone/share to correctly distinguish lookup errors from corruption errors and catch only the former.

doc: add TOC to hg.1.html and hgrc.5.html

log: prevent negative date range from displaying entire log (issue1805)

manifest/revlog: do not let the revlog cache mutable objects If a buffer of an mutable object is passed to revlog.addrevision(), the revlog will happily store it in its cache. Later when the revlog reuses the cached entry, if the manifest modified the object in-between, all kind of bugs appears. We fix it by: - passing immutable objects to addrevision() if they are already available - only storing the text in the cache if it's of str type Then we can remove the conversion of the cache entry to str() during retrieval. That was probably just there hiding the bug for the common cases but not really fixing it.

doc/README: simplify instructions

doc: use our own rst2man.py script (issue1746) The rst2man tool has not yet been part of an official Docutils release, and it is not present in most distributions. This poses a problem for people who want to install Mercurial from source, or who want to create a Mercurial package for such a distribution -- how to specify the build-dependencies? By including the rst2man.py script with Mercurial people only need a normal Docutils installation in order to install Mercurial.

util, minirst: do not crash with COLUMNS=0

manifestdict: remove unnecessary dictionary copy No need to copy the dict, dict.__init__() will do that for us. It was responsible for a non-negligeable waste of time during a qpush of an -mm queue on the kernel repo.

manifest.add(): cleanup worklist construction and iteration

manifest: simplify cache handling, use a unique cache

manifest.add(): simplify with iterators and generator expressions

color: do all setup in uisetup Now that extensions are loaded in phases, we are guaranteed to always find mq in uisetup with extensions.find and we know that the mq commands are not yet copied into commands.table.

extensions: pass ui arguement to extsetup if accepted

extensions: load and configure extensions in well-defined phases Extensions are now loaded with a call-graph like this: dispatch._dispatch extensions.loadall extensions.load # add foo module to extensions._extensions extensions.load # add bar module to extensions._extensions foo.uisetup(ui) bar.uisetup(ui) foo.extsetup() bar.extsetup() commands.table.update(foo.cmdtable) commands.table.update(bar.cmdtable) hg.repository foo.reposetup(ui, repo) bar.reposetup(ui, repo) The uisetup calls could easily be moved out to dispatch._dispatch, but have been kept in extensions.loadall since at least TortoiseHg calls extensions.loadall and expects it to call uisetup. The extensions.load function called uisetup. It now has an unused ui argument which has been kept for backwards compatibility.

highlight: move code from module top-level into extsetup

run-tests: standardize on --foo instead of -f/--foo We write -f/--foo in Mercurial help texts (docstrings), but I think it looks strange in error messages.

run-tests: use parser.error for cmdline option errors

doc/README: rst2man is now in Docutils proper

doc/Makefile: detect the right name for rst2man and rst2html docutils uses the .py extension on the commands, and so do their installer. Distribution packages might strip the .py, but the official name should work too.

Merge with crew-stable

test-keyword: update output to match 5d49fdef6fd0

hgweb: show diff header line in raw diffs

doc/Makefile: Don't show Makefile comments in output The comments makes sense when editing Makefile, but not when watching its output where it looks too much like error messages.

doc/Makefile: detect rst2man errors Make couldn't detect rst2man errors when it wasn't the last command, so empty man page files would be installed.

test-hooks: Don't hide the value of HG_PENDING Hiding the value of HG_PENDING made it less obvious what was going on in case of test failure

ui: fix NameError in ui.progress due to unit/units typo

util: quicker fspath, do not lower names when the length is different

test-casefolding: fix wrong case on hfs on linux on linux hfs keeps the old case of the file stored force it by renameing to another name and back

hghave: check for case insensitive filesystem in current dir check was done on TEMP

run-tests: expand --tmpdir and create it if needed

patch: remove the unused, broken reverse() function

patch: readgitpatch: remove unused variable 'src'

use 'x in dict' instead of 'dict.has_key(x)' "in" is faster, and has_key will be removed in py3k

churn: use genexps now that we dropped 2.3 compatibility

merge with crew-stable

churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test

templatefilters: indent: do not compute text.endswith('\n') in each iteration

util: canonpath: simplify logic if root == os.sep, then endswithsep(root) is True as well: one test is enough

Merge with crew-stable

test-parse-date: test 12-hours time formats (issue1804)

util: Fix date format for 12-hour time.

test-command-template: Don't diff files with same content Solaris diff will report "No differences encountered" on stdout

Merge with crew-stable

hgrc.5: document %unset directive

merge with crew-stable

dirstate.write: don't ignore stat data if mtime is in the future (issue1790) This change narrows the race guard that was introduced by af3f26b6bba4 ("dirstate: ignore stat data for files that were updated too recently") to not discard the _map entry's stat data if the mtime is in the future. Without this change, status locks files having odd mtimes in the future into the 'unset' state, causing needless file compares later (admittedly harmless), but also inflicting highly irritating sticky effects on tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).

Merge with crew-stable

hgrc.5: document %include directive

mq: don't mention qtop in module doc string (qtop was removed in b8dc3eba4f9d)

color: no need for itertools, zip() is good enough

log: fix traceback for log -k caused by 1ef630452e0b (issue1805)

templater: remove support for ## template variables