color: call correct superclass method in write_err Without this fix, any calls to write_err would go to stdout instead of stderr, and calls during pushbuffer would cause unpack ValueErrors on popbuffer.

convert/progress: use plural and avoid retrieving

qfinish: fix range logic for --applied qbase:qtip can include non-mq csets, use qbase::qtip instead

rebase/progress: Adding progress for rebasing

record: count lines changed as the number of lines added or removed per "record" hunk Record deals in hunks which are tighter than traditional patch hunks, really only a single run of additions/removals. Another addition, even a line after a fixed line is treated as a new hunk by record.

color: pass write/write_err to win32print correctly (issue2312)

Merge with stable

Added signature for changeset bf1774d95bde

Added tag 1.6.1 for changeset bf1774d95bde

Merge with stable

i18n-pt_BR: synchronized with db426935fa94

Merge with stable

i18n-pt_BR: synchronized with 0e789549271d

i18n-sv: synchronized with c47cb3193c53

help: fix bytes/digit confusion for hashes spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>

Merge with stable

progress: use gerund (updating) for merge progress

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

changegroupsubset(): refactor the prune() functions

Merge with stable

help: make helptable a list instead of a tuple The table should always have been a list so that extensions can append their own help topics -- hgsubversion would like to do this now.

test-command-template: test 'children' template keyword

templates: 'children' keyword The template keyword 'parents' is already present and this just provides the complimentary template keyword.

changegroupsubset(): change variable names, simplify lookup logic

changegroup(): used "linkrev" instead of "revlink"

fix comment

Merge with stable

revset: fix ancestor subset handling (issue2298)

hgwebdir: use template paths configured in the hgrc (issue2281)

changegroup*(): use set instead of dict

Merge with stable

bash/zsh completion: use HGPLAIN when invoking hg (issue2297)

patch: fix extract() docstring, it returns branch as well

merge with stable

doc: remove has_key usage in hgmanpage

gendoc: remove callable usage (check-code)

bookmarks: rewrite _bookmarks method documentation

init: create target directory recursively Subrepos with relative paths must often be cloned to locations deep in the directory structure. This allows clone over ssh (init+push) work.

doc: make sure we use our own code for generating man pages docutils would in some situations pick up its own manpage.py instead of doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.

transplant: crash if repo.commit() finds nothing to commit (makes issue2135, issue2264 more obvious, but does nothing to fix either one) This seems to happen in two distinct cases: * patch.patch() claims success but changes nothing (e.g. the transplanted changeset adds an empty file that already exists) * patch.patch() makes changes, but repo.status() fails to report them Both of these seem like bugs in other parts of Mercurial, so arguably it's not transplant's job to detect the failure to commit. However: * detecting the problem as soon as possible is desirable * it prevents a more obscure crash later, in transplants.write() * there might be other lurking (or future) bugs that cause repo.commit() to do nothing Also, in the case of issue2264 (source changesets silently dropped by transplant), the only way to spot the problem currently is the crash in transplants.write(). Failure to transplant a patch should abort immediately, whether it's user error (patch does not apply) or a Mercurial bug (e.g. repo.status() failing to report changes).

mq: cleanup status if applied mq is stripped (issue1881) stripping of applied mq patches leads to wrong state recorded in status file. find all mq patches that will be affected and clean up status file before strip.

bundle: lookup revisions after addbranchrevs When addbranchrevs extends revs, it adds changeset hashes, and not node ids. Which means that we have to lookup for revisions _after_ the addbranchrevs call, instead of before.

log: do not redefine cachefunc in walkchangerevs The same variable is defined a few blocks earlier. The first phases in walkchangerevs should in fact fill that cache, and allow faster lookups in the last phase. Redefining and overriding this cached function, (knowing that it will be called with the same arguments) defeats the caching purpose.

cmdutils: fix code style

contrib: add debugshell extension

log: document the different phases in walkchangerevs

log: slowpath: only walk specified revision range during preparation Even with --removed, it does not make sense to examine changesets outside of the revision range that was specified by the user: the last phase only yields a subset of (revs), preparation phase hence only has to examine (revs) to fill correctly fncache.

Merge with stable

revert: rename original to .orig instead of copying (issue2282) By renaming before reverting the content of the file we ensure that we handle and break hardlinks properly. Handling of other hardlinks to .orig is somebody elses problem.

inotify: make inotifydirstate.status() returns a tuple of lists. This makes it consistent with dirstate.status(), which is important if there are other extensions messing with the output of status(). Those extensions can safely assume that dirstate.status() returns a tuple of lists, because its docstring says it does. But inotifystatus.dirstate() returns a list of lists, which can break those other extensions.

protocol: move the streamclone implementation into wireproto

protocol: use generators instead of req.write() for hgweb stream responses

protocol: wrap non-string protocol responses in classes

protocol: convert StreamException to generated error code This makes it much easier to handle these errors at the transport level.

protocol: extract compression from streaming mechanics

protocol: rename send methods to get grouping by prefix

protocol: shuffle server methods to group send methods

protocol: do not translate error messages on the remote side

protocol: use return shortcut instead of respond function

protocol: command must be checked before passing in

tests: rename some tests to help grouping

keyword: add extra datefilters in a single update call

Merge with stable

Merge with main

cmdutil: fix accidental name clash with revrange function The revrange function was used further up, and when a local variable is defined with the same name, the earlier call to revrange becomes a 'local variable used before assignment' error. The clash was introduced in 890ad9d6a169.

commands: fix update's help to be more accurate Branches can have multiple heads, so it doesn't make sense to speak of "the head of the current branch". What update really does is try to update to the *tip* of the current branch.

i18n: use encoding.colwidth() for correct column width Some encoding and language combinations (e.g.: UTF-8 and Japanese) cause encoding characters into sequence of bytes more than column width of them. So, encoding.colwidth() should be applied instread of len() on i18n strings. In addition to it, formatting by '%*s'/'%-*s' also uses "number of bytes" to calculate space padding size, and should be fixed, too.

merge with stable

log: slowpath: do not read the full changelog When in the slowpath, we are examining _all_ changesets in revs. We need to order reads so they happen increasingly for I/O performance. Increasing windows were used to read changelog backwards in a windowed manner, reading the changelog forward inside each window. But since no revision range was specified, it was equivalent to reading the full changelog, even if a single revision was passed to the commandline. When --removed is used, we _need_ to scan all changesets, but if we're only looking for file patterns, this is not necessary and we can stick to the revspec that was given to us.

log: remove increasing windows usage in fastpath The purpose of increasing windows is to allow backwards iteration on the filelog at a reasonable cost. But is it needed? - if follow is False, we have no reason to iterate backwards. We basically just want to walk the complete filelog and yield all revisions within the revision range. We can do this forward or backwards, as it only reads the index. - when follow is True, we need to examine the contents of the filelog, and to do this efficiently we need to read the filelog forward. And on the other hand, to track ancestors and copies, we need to process revisions backwards. But is it necessary to use increasing windows for this? We can iterate over the complete filelog forward, stack the revisions, and read the reversed(pile), it does the same thing with a more readable code.

log: refactor: test for ranges inside filerevgen

log: refactor: compute the value of last outside of filerevgen

context: use os.lstat instead of os.stat to fetch file size When file is a link, we want the size of the link itself, not the size of the file it points to.