qpush --move: move the right patch even with comment lines 88fc876a4833 caused that we find the index of the moving patch in self.series but look it up in self.full_series. The difference between these is that full_series also contains comment lines, and we thus moved the wrong patch. Use back self.full_series to find the moving patch, but take care of striping the patch guard markers before comparing the patch name. Test cases have been added for comments and empty lines in self.full_series, and for the case of guarded patches. Original patch contributed by Mads Kiilerich <mads@kiilerich.com>

merge with stable

perf: break down long line

dispatch: trailing whitespace

merge crew and main

merge crew and main

mq: clarify the fact that qimport is trying to read a file "hg qimport tip" would throw "abort: unable to read tip" before this.

revset: add min function

runrst: try to be more helpful if docutils is not installed

mq: correct qimport documentation

merge with stable

bookmarks: don't allow name to contain whitespaces only

context: reuse filecontext.cmp in workingfilecontext.cmp Same code path should mean less mistakes, and hopefully, better caching.

filectx: use cmp(self, fctx) instead of cmp(self, text) This allows more flexibility in implementation, and in particular, lets the context decide if revision text has to be loaded or not.

mq: fix qimport --name --existing --force on win32 os.rename() does not overwrite existing targets on Windows.

mq: document possible combination of -e and -n for qimport

mq: support "qimport --existing --name renametothis thatexistingpatch" Before this change, the command would abort with a not too clear "patch renametothis does not exist" error. This change makes: qimport --existing --name renametothis thatexistingpatch equivalent to: qimport --existing thatexistingpatch; qrename thatexistingpatch renametothis

localrepo: refactor filter computation Separate loading part from access part to be able to tell with: repo._loadfilter(name) bool(name in repo.filterpats) if there is a 'name' filter available.

Merge with stable

Merge with crew

alias: improved diagnostic when arguments include --cwd, etc. The logic pre-emptively checks for -R, --repo, --repository and --cwd in order to give the user a more helpful error message. In addition, each option is handled invididually, which avoids listing them all in the error. Before: % hg --config alias.broken='push --cwd /dev/null' broken abort: Option --cwd may not be abbreviated! After: % hg --config alias.broken='push --cwd /dev/null' broken error in definition for alias 'broken': --cwd may only be given on the command line

perf: add perfrevlog function to check performance of revlog

revlog: add a flags method that returns revision flags

tag: do not allow tag names to consist solely of whitespace (issue2307) (simplification and test by mpm)

Merge with stable

convert: warn on superfluous / in paths shlex is really a bad parser for this line-based format ...

inotify: remove unused variable

convert: handle closed branch heads in hg-hg conversion (issue2185)

check-code: add warning on lines over 80 characters

debugbuilddag: build repository content in binary mode

cleanup: typos

revsets.txt: minor improvements

dispatch: write Abort hint to stderr too

bookmarks: sort diffbookmarks() output

Merge with stable

convert: warn on superfluous / in paths shlex is really a bad parser for this line-based format ...

inotify: remove unused variable

keyword: move collecting of [keyword] patterns to reposetup (issue2303) When cloning, prevent [keyword] filename patterns configured locally in the source directory to persist during the update in the destination. a) move [keyword] retrieval (back) to reposetup b) remove the corresponding global kwtools attributes Add test cases.

hgwebdir: allow pure relative globs in paths This allows the (to me, in some setups) obvious configuration: [paths] / = * or / = ** Relative paths used to work with [collections] even though it isn't documented. Perhaps it should be documented?

alias: ensure checksignature() is applied directly to the command (issue2286) Aliased commands that received bad arguments would raise TypeError instead of SignatureError. This only affected commands that weren't wrapped by extensions. Using util.checksignature() in cmdalias.__call__() ensures SignatureError is raised correctly.

dispatch: give better error message when cwd doesn't exist (issue2293) Previous behavior wasn't very helpful: $ hg st foo abort: No such file or directory Now we tell more about what failed: abort: error getting current working directory: No such file or directory

i18n: safety writing into non-ASCII named files on any shell implementation some shell implementation (e.g.: dash) can not handle redirection into non-ASCII UTF-8 named file correctly.

convert: handle closed branch heads in hg-hg conversion (issue2185)

check-code: add warning on lines over 80 characters

Remove variable output affected by length of TMPDIR. If the temporary directory is longer than /tmp then it's possible that the Subject line will get wrapped by the headencode function.

chunkbuffer: split big strings directly in chunkbuffer

localrepo.status: move fixup concatenation inside if block for clarity clean += fixup only makes sense if fixup is not empty; it should be inside the "if fixup" test.

chunkbuffer: targetsize isn't used outside of read()

chunkbuffer: use list instead of cStringIO

chunkbuffer: use for/else to detect end of iteration

changegroup*(): use enumerate when possible

changegroupsubset(): with the fix, prune() is actually useful in the testsuite

test-permissions: echo commands to make output readable

changegroupsubset: simplify knownheads/has_cl_set computation

changegroupsubset(): ancestors() is not inclusive, we need to remove the "heads"

changegroupsubset(): move comment at the right place