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

test-http-proxy: hide logged URL port number, works with--jobs

patch: rewrite diffstat with util.filter() Simpler and works under Windows.

test-mq-qimport: fix URL generation under windows

test-patchbomb: write in binary mode, force non-interactive mode (win32)

test-http-proxy: print the log from the proxy

merge with dsop

bookmarks: do nothing if commit was not successful.

bookmarks: Add tests

bookmarks: Strip bookmark names of whitespace, just like tag names

bookmarks: Correctly reject newlines in bookmark names Without this fix, a single newline is a valid bookmark name since strip() removes it.

bookmarks: Require a bookmark name when a revision is specified

bookmarks: Improve documentation

bookmarks: Avoid unconditional forwarding of bookmarks for the null revision This patch fixes the following minor problem: % hg bookmark -r null test % hg bookmarks test -1:000000000000 [...] % hg commit % hg bookmarks * test 17:861ce7a241f9 That is: Bookmarks referring to the null revision are always forwarded to the current revision.

bookmarks: Rename --move to --rename To me, --move sounds like "make an existing bookmark refer to another revision", but --move currently means "rename an existing bookmark". This patch renames the switch to --rename to make it easier to understand.

bookmarks: Require new bookmark name when renaming

bookmarks: Only save undo.bookmarks if bookmarks exist Otherwise the command will abort when there is no .hg/bookmarks file.

bookmarks: Avoid long lines

bookmarks: Fix spelling and grammar

bookmarks: Remove trailing space

test-init: add test with format.usefncache=false

merge with crew

patch: fix patched files records in externalpatcher()

Merge with crew-stable

merge with crew

patch: remove double variables in copyfile() func

convert: return remote branches in git source When converting git repos, all stuff happening on branches seems to be ignored. This is caused by the fact a "git clone" of a remote git repo has all its branches prefixed with "origin/". By chance, the "origin/master" branch is always linked to a local "master" branch. So getheads() returns only the master head, and it ignores all the other heads. Make sure getheads() returns all heads, forcing remote branches to be return by git-rev-parse.

convert: fix non-ASCII filenames retrieval from git sources (issue 1360)

hgrc.5: explain order of mail.charsets TODO: add mail.charsets section to hgrc.5.ja.txt

test 261a9f47b44b: grep w/ match in last line w/o newline Last character in match output omitted to avoid infinite loop.

Bookmarks: Add the bookmarks extension Mercurial bookmarks are local moveable pointers to changesets. If you commit a changeset that is based on a changeset that has a bookmark on it, the bookmark is forwarded to the new changeset. Thanks to Ian Dees, Ronny Pfannschmidt for their patches, Thanks to ronny, tonfa, prianha, mpm, #mercurial for their comments and their support that helped me to get things done.

zeroconf: don't break on hg showconfig

findincoming: build the correct list from the start

Remove trailing spaces.

Document config option format.usefncache and improve format.usestore docs.

add format.usefncache config option (default is true) This enables for example "hg clone --config format.usefncache=0" which creates a non-fncache repository, which then can be read by Mercurial versions before 7946503ec76e.

fix pull racing with push/commit (issue1320) changegroup() has a problem when nodes which does not descend from a node in <bases> are added to remote after the discovery phase. If that happens, changegroup() won't send the correct set of nodes, ie. some nodes will be missing. To correct it we have to find the set of nodes that both remote and self have (called <common>), and send all the nodes not in <common>. This fix has some overhead, in the worst case it will re-send a whole branch. A proper fix to avoid this overhead might be to change the protocol so that the <common> nodes are sent (instead of the <bases> of the missing nodes).

convert: correctly detect missing revlog for root revisions

convert: ignore hg source errors with hg.ignoreerrors (issue 1357) This flag makes missing revlog errors to be ignored which allow broken repositories to be fixed by converting them from and to Mercurial.

grep: avoid infinite loop when trailing newline is missing

introduce fncache repository layout * adds a new entry 'fncache' to '.hg/requires' for new repos * writes new file '.hg/store/fncache' * hash-encodes filenames with long paths (issue839) * encodes Windows reserved filenames (issue793)

bisect with command: ability to skip revision or abort bisection

bisect: ability to check revision with command

Make it possible to disable filtering for a pattern. Rationale: Apparently there were no way to disable for example win32text extension locally. RFC: Can it already be done another way?

i18n: import _ instead of gettext

Minor cleanup: Add missing space forgotten in recent change.

Merge with crew-stable

convert: read git output in binary mode under Windows (issue 1359)

util: add 'mode' argument to popen()

inotify: avoid passing potentially stale stat to update

inotify: add debugging mode to inotify compare inotify results with dirstate results and report any changes return dirstate results for safety

inotify: auto-start by default when enabled

inotify: friendlier message when daemon not running

extensions: use new wrapper functions

extensions: add wrapping functions

run-tests: --interactive overrides -j

findcmd: have dispatch look up strict flag

imported patch filteruser.patch

Autodetect static-http

help: update help make help description 'topic'-oriented rather than 'command'-oriented change 'special' to 'additional'

chmod -x simplemerge.py

findincoming: do the binary search in branches in parallel

protocol/between: the protocol expects to have ' '-separated tuples

tests: log and show errors

theme/monoblue: put the search box entirely in the header

Remove trailing space

theme/monoblue: do not use a fixed width for the overview box

tests: add more testing for webdir nesting

hgwebdir: show nested repositories (issue1336)

patch/diff: use a separate function to write the first line of a file diff

patch: consolidate two different regexes for parsing of git diffs

patch: extract local function addmodehdr

help: show extension commands in short list, separate extension list in help In 'hg', we now show a short list of commands, including extension commands. In 'hg help', we show core commands, a list of enabled extensions, and topics.

help: show help topics by default in 'hg help', with longest available id

mail: correct typo in variable name