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

merge with crew

mail: test patch mime encoding for patchbomb

patchbomb: mime-encode clean utf-8 patches (issue814) Fixes issue814, but only for utf.

mail: mime-encode patches that are utf-8 utf-8 can be safely detected without making assumptions on the encoding/locale used by the recipient. Content-Transfer-Encoding for utf-8 patches is base64 (default of python's email module).

Some additional space/tab cleanups

merge with crew-stable, again

merge with crew-stable

spaces->tabs in one line of a C extension for consistency

clean up trailing spaces, leading spaces in C

merge with crew-stable

clean up trailing spaces

hgweb: working diff for removed files

hgweb: remove links to non-existent file versions

coal/paper: widen author column in log table

hgweb: be sure to drain request data even in early error conditions Thanks to Mads Kiilerich with noticing this. The hg client can only read data after all the sent data has been read, so we have to read all the request data even if we're not going to do anything with it (in error conditions). This is not easy to fix in the client, because we're using Python's httplib, which is strictly stateful. Abstracted the draining into a separate method.

merge with crew-stable

Fix Debian bug #494889 (fetching from static-http://... broken) Changeset 6605a03cbf87 which fixed issue965 (hg clone static-http does not work for empty repos) broke cloning of repos with old layout (without store) via static-http. This fix makes cloning from old-style repositories possible again, but will not allow cloning of empty old-style repositories as this can not be detected reliably.

mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.

merge with crew

parsers.c: do not try to untrack after a failure

parsers.c: fix integer overflows thanks to zzuf for helping finding those

Merge with crew

Use dummy diffstat in tests and remove older diffstat workaround. This makes test-notify pass on systems without diffstat installed or where the diffstat version yields a different output.

Fix test-bundle-type output by changing head|cut to cut|head. With some versions of cut the output otherwise has no end of line.

convert documentation: --config argument with spaces needs quoting.

Copy index before parsing to enforce alignment with inline data present. Fixes issue1348 (Bus error in parsers.c) on Solaris/sparc.

parsers.c: there is no reference to data_obj, so it shouldn't be decref'ed

merge with crew

hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it.

Fix test-notify output for older diffstat versions.

Add util.popen3 fallback, simplify import of Popen3

Fix util.popen2 for Python 2.3 1. trigger ImportError early, so fallbacks are activated 2. util.popen2 replaces previous usage of os.popen2, not popen2.popen2

mq: heavy rearrangement of qnew to make it recover reliably from errors. Closes issue1269.

mq: abort qnew -f if any file in an explicit list cannot be read

mq: make qimport -f work properly. Closes issue1255. From Bernhard Leiner.

Merge with crew

mq: let qimport read patches from URLs

mq: do not invoke editor until just before patch creation. Closes issue1346.

merge with crew

add a missing +x to test-inotify-lookup

index parser: fix refcounting in case of errors, refactor due to incorrect refcounting, on a bad revlog it was failing with: *** glibc detected *** /usr/bin/python: corrupted double-linked list: 0x0816d318 *** and a backtrace.

patch: pass linereader to binaryhunk.extract() instead of wrapped fp It unifies input patch file access methods

patch: pass linereader to scangitpatch(), extract from iterhunks() It's good because it unifies the patch file access methods.

patch: change functions definition order for readability

patch: map changed files to patchmeta directly

patch: patchmeta gives (islink, isexec) tuple instead of int mode

patch: extract and rename gitpatch into patchmeta, document

patch: remove applydiff() useless updatedir and rejmerge arguments

merge with crew

inotify: fix status not showing "clean" files (issue907) The inotify server uses 'c' for clean, not 'n'.

run-tests.py: report missing file as an error

Merge with crew

Prevent import over an applied patch (closes issue795)

issue 1144: prevent traceback on verify of bundles

merge with crew

run-tests.py: use --prefix instead of --home Some SUSE version don't like --home, they fail with: "error: must supply either home or prefix/exec-prefix -- not both" this is due to SUSE shipping a distutils.cfg conflicting with --home.

test-permission: put sane permissions at the end of the test If we don't do that, we won't delete all directories at the end of the test

util: handle EINVAL in _statfiles_clustered() Raised when osutil.listdir is called on a non-directory entry.

_listdir only uses dfd if AT_SYMLINK_NOFOLLOW is defined

merge with crew

fix issue with strip() for revlog with non-monotonic linkrevs (issue1342) extra nodes should always be included, do the call after the pruning

revlog parser: use ntohl() instead of ntohll() (fix endianness issues)