dispatch: generalize signature checking for extension command wrapping

update help on git diffs

zsh: make resolve with no options only complete unresolved files

mergetools: add pointer to the usual filemerge path

zsh: support for resolve

graphlog: fix regression with filelogs introduced by 7bc62ebe7693

Merge with crew-stable

convert: be even more tolerant when detecting svn tags Former code failed when tracking child directories we assumed were renamed with their parents but were really created in the tags directory. This happens in jQuery repository with /tags/ui/1.5b4/release@5455.

test-pull-branch: make it executable

graphlog: fix python2.3 incompatibility (used genexp, sorted())

keyword: move common code out of commit condition

lookup: fast-paths for int and 'tip'

doc: handle shortened command synopses

keyword: be more efficient about ctx usage

graphlog: kill whitespace from earlier refactoring

extensions: copy __module__ for wrapped commands

pull: update to branch tip if there is only one head on the current branch On pull, if the current named branch has only one head, update to it.

graphlog: use built-in log output buffering

graphlog: refactor common grapher code Extracts the column and edge determination code into a separate function usable on generic DAGs with at most 2 parents per node. grapher() is very similar to graphmod.graph(). I shall look into merging them when I try visualizing patch branches in hgweb. Started using contexts and renamed a bunch of variables (fewer underscores).

cmdutil: use change contexts for cset-printer and cset-templater

context: use descriptors to speed up lazy attributes

context: special-case changectx setup for integer changeid

Add contrib/perf.py for performance testing

lookup: speed up partial lookup

help: remove redundant 'hg <command>' from command synopses

revlog: speed up parents()

revlog: remove delta function

linkrev: take a revision number rather than a hash

patchbomb: add option to send intro email for a single patch (issue1120)

patchbomb: fix patch name generation in patch series

patchbomb: add tests for diffstat, inline, and attach options

patchbomb: make test markers more syntax highlighter friendly

graphlog: add assertion for allowed n_column_diff range

graphlog: drop redundant comment (see docstring)

patchbomb: extract a bunch of nested functions - clarifies dependencies on variables - extracts potentially useful utility functions - no need for separate confirm() function - error message style conformance - PEP 8 conformance

patchbomb: make `hg email` reusable for other patch sources Adds two internal options, patches and patchnames, which allow other extensions to email a given set of patches. The pbranch extension needs this to send its patches which are diffs between topic branches.

patchbomb: make options to email command reusable Makes the option set that controls the actual emailing of the patches available as patchbomb.emailopts.

Backed out changeset c5dbe86b0fee (issue1375)

inotify: fix replacing a folder with a file (issue1375)

fix test-export portability (issue1383) wc outputs with leading spaces on *BSD

merge with mpm

tests: fix test failures from default/template changes

tests: make killdaemons.py executable

hgweb: fix up the less/more links on the graph page Previously, they pointed to a non-intuitive revision, and got borked when using a URL-specified style combined with alternate revcounts.

tests: add killdaemons helper script

run-tests: allow turning off diff display

protocol: avoid sending outrageously large between requests

tests: fix test-hgweb to not leak directory name

hgweb: improve color discrimination for paper and coal

hgweb: update tests for paper style diff -r ca03debb3dcd -r 4e1e6aee37e8 tests/test-hgweb-commands.out Binary file tests/test-hgweb-commands.out has changed

hgweb: move old style to spartan/

hgweb: Change default style to paper

hgweb: support for deny_read/allow_read options reimplementation of a patch provided by Nilton Volpato. Folded into a single patch by Thomas Arendsen Hein.

add missing import from 618140c75d8d

fix restart of interrupted recover Ignore missing files if they are already removed. Thanks maelcum on IRC for reporting it.

hgweb: show revision number in the graph pagination

hgweb: fix pagination for graph

Keep sessionvars with repository links added in a0843c82d1a2 Without this, e.g. "?style=coal" would be dropped.

Fix test output for updated gitdiffs help and web template cleanups

Do not abort with inotify extension enabled, but not supported by the system. And remove the "native support is required" message which is generated at an inappropriate location and is printed more than once when using 'hg status'.

Enhance gitdiffs help text

Kill trailing whitespace in templates

graphlog: move functions around, eliminate helper function Makes it easier to read all of the code.

graphlog: split the actual DAG grapher out into a separate method This allows extensions like pbranch to use asciigraph() to graph dependencies for patch branches, but could be used for basically any DAG.

graphlog: rename some vars prior to refactoring

graphlog: make some comment lines more like others in punctuation

patchbomb: fix indentation

patchbomb: move exportee class to top level As suggested by djc.

ui: log non-interactive default response to stdout when verbose This allows test scripts that feed their output into documentation to properly show the session as it would appear to an end-user.

export: fixed silent output file overwriting hg export -o outfile 1 2 3 4 had the same effect as hg -o outfile 4 This was caused by opening with 'w' instead of 'a'. This only occurs when the filename pattern resulted in ambiguous patch filenames.

merge bookmarks

bookmarks: Test if rebase works with bookmarks Add a test that tests if rebase works fine with bookmarks.

bookmarks: Use dirstate to determine the current node in addchangegroup Using the changectx might result in a lookup error during the strip command. Thefore we use the current dirstate to get the parents of the working directory.

tests: run svn tests only with svn bindings >1.3

coal/paper: link repo name to hgweb root

paper: don't keep the menu affixed to the top This makes scrolling slow and causes browsers to use a lot of CPU time.

Shorten sleep in inotify test

hgweb: move another utility function into the webutil module

hgweb: move the diffs() generator into webutil

hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258) This gets us git diffs when enabled and doesn't pick erratic file parents.

patch: turn patch.diff() into a generator This should even be a little faster than passing in an fp argument.

help: commands supporting --git point to the gitdiffs topic (issue1352)

mq: reflow qnew help, add help for options

hgweb: descend empty directories in web view When a manifest has a series of directories with nothing in them but a single directory, displaying the entire chain of empty directories allows for navigation down to the first non-empty directory with a single click. Because Java links package hierarchy to directory hierarchy, and because Java conventions include at least three empty directories at the top of this hierarchy, descending down empty directories is very common in Java web tools.

inotify: fix bug in formatting

Corrected some command synopsises

inotify: server raising an error when removing a file (issue1371) When a file is deleted via hg rm <file> the dirstate marks the file with a status of 'r'. The physical file has been deleted, but the inotify server tries to do a stat on the file after it's been removed. Patch catches the exception and correctly call updatestatus()

Fix util._statfiles_clustered() failing at root of a windows drive Report and initial fix by Andrei Vermel <avermel@mail.ru>.

hgweb: conditionally show file logs for deleted files

coal/paper: show a search tip when hovering over search box This doesn't work in IE, because IE only supports :hover on <a> elements.

kill some trailing spaces

mq: use cmdutil.matchfiles instead of match for qnew -f. Closes issue1368.

mq: put qnew tests into own file, fold in qnew-twice

zeroconf: Don't break serve if no internet connection is present.

hgweb: pass more information about parent/child csets to templates

help: add a topic on git diffs (issue1352)

hgweb coal/paper: Restore IE compatibility hack

Backed out changeset a1f8ad3c1821

add test-fncache

merge with mpm

Allow per-file shadowing of static directory in templatepath

hgweb: handle subdirectories within static directory

coal: remove dead CSS code

url: detect scheme with a regexp instead of urlsplit() The latter says 'c' is a scheme in 'c:\foo\bar'

url: fix file:// URL handling

bookmarks: fix strip handling

fix zeroconf handling for hgwebdir (error found by pychecker)

fix missing import, spotted by pychecker

remove unused variables

Fix https availability checking thanks to Augie Fackler for noticing it.

rebase: avoid redundant merges (issue1301)

Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.

help: Refine a bit the help text of "hg update" Parts of the original text were submitted by Hubert Kauker (Hubert dot Kauker at travelbasys.de). This is a slightly revised version of Hubert's original text.

add new test-hybridencode.py

statichttprepo: cleanups, use url.py (proxy, password support) - unify httprangereader.py and statichttprepo.py:rangegreader() - build the opener from url.py, that allows use to puse username and password in the url, to follow the proxy settings from hgrc, etc.

'\' should be escaped twice, for the shell, and for tr

merge with crew

use our urlopener (proxy handling, etc) instead of urllib

factor out the url handling from httprepo Create url.py to handle all the url handling: - proxy handling - workaround various python bugs - handle username/password embedded in the url

httprepo: factor out proxy handling