merge with crew-stable (again)

merge with crew-stable

keyword: simplify repo.local and bundle check (as in 2f4a399a8787)

Merge with crew-stable

Added signature for changeset 3773e510d433

Added tag 1.1.1 for changeset 3773e510d433

resolve: clarify and simplify help

tests: fix no-diffs option

archive: fix bogus error message with no working directory

resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer

fix typo

hgweb: mq repos should be in non-recursive collections, too

tests: fix test-mq-qclone-http (broken by e60aaae83323)

hgweb: recurse down collections only if ** in [paths] collections: direct child repos only paths *: direct child repos only (like collections) paths **: recursive discovery When ** is used, the mq repository (if any) is also shown.

inotify: do not attempt to monkeypatch bundlerepos

Merge with crew-stable

patch: simplify linereader

Merge with crew-stable

merge with -stable

patch: handle git patches that remove symlinks (issue1438)

context: enforce memctx.files() unicity localrepo.commitctx() expects changed files lists to contain unique items and does not sort itself. Passing duplicates makes them evaluated more than once and changes the committed changelog id.

store: encode trailing period and space on directory names (issue1417) Windows won't create directories with names ending in period or space, so we encode the last period/space character in directory names of non-hashed paths in the store using reversible ~xx encoding (' ' -> '~20', '.' -> '~2e'). With this change it is possible to remove a directory ending in period or space that was inadvertantly checked in on a linux system while still being able to clone such a repository with its full history to Windows (see also issue793).

store: don't create dirs ending in period or space for hashed paths (issue1417) Windows won't create directories with names ending in period or space, so we replace the last period/space character in truncated directory names of hashed paths with some other character (underbar).

convert-cvs: correctly handle Removed replies, fixes bug 1427

Fix test-acl failure on AIX due to read only LOGNAME. On AIX /etc/profile sets LOGNAME read only. This causes test-acl to fail when it comes to set LOGNAME in do_push(). Work around this by using env to set LOGNAME and run the command.

Merge with crew

Update zsh completion to use debugcomplete -v instead of parsing help

Make debugcomplete -v print aliases as well as commands

Merge with crew-stable

patch: catch only IOError from makedirs()

test-mq-missing: add test for directory creation on git copy

When applying a git diff, ensure that the target dir exists for new files

Revise Bugzilla module comments into extension help. Revise the comments detailing module usage at the start of the Bugzilla extension into extension help text. Expand the detail given on extension settings, in an attempt to permit the user to configure successfully without having to study the extension code. Show a sample configuration as well.

test-convert-cvs-builtincvsps: test debugcvsps command

Add debugcvsps command, replacing cvsps script

merge stable changes, via crew-stable

merge changes from stable

hgrc 5: fix email.charsets documentation

notify: no charset conversion when testing Same as for patchbomb. Make "test" a notifier attribute so we don't have to check the boolean over and over.

Merge with crew-stable

issue1419: catch strange readline import error on windows

Merge with crew-stable

util: disable walkrepo() recursive behaviour Revert b1aea76f700 and 268c582bd42a for performances reasons. Traversing checkout working directories may be too expensive.

Fix Bugzilla integration to work with new Bugzilla 3.2. Bugzilla 3.2 changes the type of all MySQL tables it uses from MyISAM to InnoDB. MyISAM does not support transactions, and performs an implied commit after each update. InnoDB does support transactions, and so exposes a bug where changes to the Bugzilla database were not committed, and so with 3.2 are lost when the database connection closes.

tests: test-walkrepo shouldn't throw SystemExit Write to stdout instead of throwing Exceptions

bookmarks: this is a comment, not a string

Merge bookmarks

Merge backout

Backed out changeset 4c3e0ad58c5b In discussion with mpm and tonfa we decided that we need a more generic solution and not a bookmark specific.

Merge backout

Backed out changeset 187a13bd14c6 In discussion with mpm and tonfa we decided that we need a better rev syntax instead of a bookmark specific solution.

Merge bookmarks

bookmarks: do not overwrite bookmarks.current if not necessary If we update to the ref that the bookmarks.current points to, we do not want to update bookmarks.current

bookmarks: add --only-bookmark option to log

bookmarks: Fix tests As we merge tags now with bookmarks we have add those tags to the tests.

bookmarks: more git-like branches Bookmarks are not really git branches, but with the track.current option we try to focus more on a git like behavior as this was requested.

bookmarks: Include bookmarks in tags.

bookmarks: Fix indention

bookmarks: Adds support for a --non-bookmarked option to push

Merge with crew-stable