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