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