dispatch: add shell aliases This patch adds git-style "shell aliases" to Mercurial. Any alias with a definition beginning with a '!' will be treated as a shell alias. For example: [alias] echo = !echo qempty = !hg qrefresh -X "`hg root`" ; echo Emptied patch "`hg qtop`" $ hg echo foo foo $ hg qempty Emptied patch foo $

convert: cleanup of filemap help text Clarify that: - Specified paths are matched by comparing name of file or directory. - Line order (thus) doesn't matter. - Rename doesn't imply include.

check-code: add test for callable

extensions: add a few assertions to wrapfunction() and wrapcommand(). Specifically, assert that the given wrapper is callable in both functions, and assert that the original was also callable in wrapfunction().

extensions: improve language for wrapfunction() docstring.

extensions: add docstring for wrapcommand().

commands: mention "hg status -C" in addremove help

Merge with stable

test-merge-closedheads: test cc982ff2dcf8

commands: only warn when reopening the workdir's branch When commiting, a check is made to see if one of the parents is a closed head. However this did not check that the branch of the commit is the same as the closed head, so one could get a warning message on the sequence hg commit --close-branch hg branch new-branch hg commit or when merging in a closed head.

Merge with stable

mq: fixed ENOENT when qrename to new/directory.patch MQ patch name can contain slashes, e.g. 'foo/bar.patch'. Currently "qnew foo/bar.patch" works, but "qrename foo/bar.patch new/dir.patch" fails with "No such file or directory". Also added test case for "qnew foo/bar.patch"

mercurial.spec: rename docutils to python-docutils in BuildRequires Even though the name of the project is Docutils, most packagers use the package name python-docutils to fit into the naming scheme of other packages written in Python. The name is used by Fedora, EPEL, DAG, Mandriva, and a few other distributions.

glossary: fixed typo in "Directory, working" description The term "Directory, working" referenced a non-existant term named "Parents, working directory". This patch fixes the typo.

Merge with stable

test-log: also test "log -p -R" case

log: fix missing diff output for hg log -p in sub directory prep(ctx, fns) receives paths relative to repository root, not cwd.

commands: document return values of add and paths commands

mergetools.hgrc: add vimdiff Imported from deb_specific__mergetools patch in Debians patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/

Merge with stable

zeroconf: small fixes in docstring Use reST role for consistency, import small part of Debian's proposed_upstream__correct-zeroconf-doc patch from http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/

hgweb: add link to wiki

hgweb.wsgi: add a URL to the corresponding wiki documentation Imported for_upstream__add_doc_url_in_example_files.patch from Debian's patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/

churn: remove tuple parameter unpacking (deprecated in py3k)

record: removed 'reduce' calls (unsupported by py3k) Quoting python's documentation, "Note that sum(range(n), m) is equivalent to reduce(operator.add, range(n), m)". The "sum" function is a builtin from 2.3 on and there's no reason for not to use it.

record: tuple parameter unpacking is deprecated in py3k

convert: tuple parameter unpacking is deprecated in py3k

revlog: Marked classic int divisions as such.

Merge with stable (again)

debugger: give a little intro before entering pdb

debugger: show traceback before entering pdb post-mortem

Merge with stable

wix: generate a new GUID for the help folder A GUID change is recommended after changes like 159233cc9c14

wix: pick up new help topics added between 1.5 and 1.6 These files are not included the 1.6.0 installer, but will be picked up by nightly builds as soon as this makes it to the stable branch.

Added signature for changeset f786fc4b8764

Added tag 1.6 for changeset f786fc4b8764

log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.

i18n-pt_BR: synchronized with d3c3e2fdeb0c

commit: add missing _()

subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)

Merge with i18n

i18n-da: translated eol extension and various small strings

i18n-ja: synchronized with 13d02d6677f2

i18n-pt_BR: synchronized with 59af1d65029c

merge with stable

i18n-sv: synchronized with 13d02d6677f2

i18n-pt_BR: synchronized with 9fa255c32406

Merge with stable

i18n-pt_BR: glossary.txt translation

i18n-sv: output from 'hg' is once again fully Swedish

i18n-sv: synchronized with 469a48dff18b

i18n-pt_BR: synchronized with 2186124f08e4

Merge with stable

i18n-sv: synchronized with 4d03c3680400

subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)

http: deliver hook output to client

setup: ignore failures to build optional inotify extension

revset: make negate work for sort specs

update: synchronize permissions in the dirstate (issue1473) fix by Benoit, updated by mpm to not affect all clean files

heads: fix templating of headers again (issue2130) (tweaks and test by mpm)

minirst: use unicode string as intermediate form for replacement Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences.

subrepo: fix recording of + in .hgsubstate (issue2217)

mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.

test-acl: don't use $PWD solaris ....

test-alias: don't use the environment variable PWD solaris ...

revert: Make it clearer when not to use revert

progress: check stderr.isatty() before each print This prevents writing progress information to a non-tty stderr if one is swapped in after startup, which happens in `hg serve`.

http digest auth: reset redirect counter on new requests (issue2255) This fixes a regression introduced in a1e575b48563 when Mercurial reuses the auth handler for several requests and the redirect counter never is reset.

revset: deal with empty sets in range endpoints (spotted by Julian Cowley <julian@lava.net>)

subrepo: fix silent push failure for SVN (issue2241)

merge: pass constant cset ancestor to fctx.ancestor

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.

merge: document how to 'undo' a merge

resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.

revset: fix spelling typo

parser: fix URL to effbot

glog: fix crash on empty revision range

mercurial.spec: don't include convert-repo - use "hg convert" instead

revset: remove debugging leftover

contrib: update tcsh_completion with commands for 1.6 Added the following commands: debugbuilddag debugdag debugpushkey debugrevspec.

bookmarks: fix in/out return values

bookmarks: fix bogus cut and paste for outgoing

addchangegroup: pass in lock to release it before changegroup hook is called Currently, callers of addchangegroup first acquire the repository lock, usually to check that an unbundle request isn't racing. This means that changegroup hook actions that might write to a repo get stuck waiting for a lock. Here, we add a new optional lock parameter and update all the callers. Post-1.6 we may make it non-optional.

cmdutil: only output style header once in non-buffered mode (issue2130)

bookmarks: touch changelog on write to force hgweb reload

mq: explicit exit code when patch is already on top

mq: fix qpush --move for selected guarded patches In the case of guarded patch, the patch could not be found because the full_series list contains also the guard value appended to each patch name. As we already checked that the patch is pushable above in the code, we just have to use the series list (which doesn't contains guard value) to get the patch index.

help: glossary.txt formatting fixes

help: fix glossary.txt named branches description

zeroconf: Use BadDomainName exception instead of string exceptions String exceptions no longer work in python 2.6. Use exception classes instead.

bookmarks: Use error message consistently The 'updating bookmark %s failed!' message is better than 'failed to update bookmark %s'. To have more consistent error messages we use just 'updating bookmarks %s failed'.

Merge with default, fix up stray topological head from i18n

i18n: disable check-code on polib.py

bookmarks: Add -B option to incoming/outgoing to compare bookmarks We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option is passed we compare bookmarks instead of changesets. This can be used to see which bookmarks do not exists on the remote site.

Merge with i18n

discovery: use stable sort order in --new-branch warning A Python set seems to do this already when you iterate over it, but this should be considered an implementation detail and not something we can rely on. This also gets rid of an unnecessary string conversion -- the set already contains strings.

Merge with i18n

Merge i18n default into stable

i18n-pt_BR: synchronized with b4467a7d5c75

Merge with mpm

i18n-da: copy msgids that does not need translating

acl: delete trailing whitespace in docstring

i18n-da: synchronize with 42408cd43f55

Merge default into stable for the 1.6 code freeze

revset: improve help on strings

tests: extend revset test

merge: sort arguments to stabilize the ancestor search

merge: improve merge with ancestor message

ui: ignore EIO in write_err Hgs signal handler will catch the signal for example if the terminal hg is running in is closed. That will make it try to warn that it was 'killed', but that might fail with EIO and cause hg to exit with an unhandled exception. Normally nobody cares, but system error handlers such as Fedoras abrt will notice and report https://bugzilla.redhat.com/show_bug.cgi?id=596594 .

http push: break infinite recursion on failure with Python 2.6.5 (issue2179) Python 2.6.5 will keep resetting the retry count on redirects, for example when the server returns 401 on failing auth (like google code currently does). We stop the endless recursion by not resetting the count. http://bugs.python.org/issue3819 introduced the regression with Python 2.6.5. http://bugs.python.org/issue8797 discusses a fix which might make it to 2.6.6 and 2.7.0.

pager: respect HGPLAIN Pager shouldn't be enabled for scripting use.

patchbomb: reduce number of opts.get calls Rename outgoing() function to getoutgoing() analogous to getbundle() etc. to avoid name conflict.

parser: improve infix error checking (spotted by timeless)

transplant: when reading journal, treat only lines starting with "# " special like patch.extract() does

revrange: fix up empty query again

revset: add some tests

Explain trust near hgrc in config help

test-import: test git patch import with strip Tests revision 0429d0d49f92

revset: fix up contains/getstring when no args passed

revrange: attempt to parse old-style queries as a first pass