mq: switch to new summary hook mechanism

summary: augment output with info from extensions

dirstate: don't overnormalize for ui.slash This should fix the issue exposed by debugpathcomplete on the buildbot.

merge with stable

bundle-ng: move progress handling out of the linkrev callback

bundle-ng: simplify lookup and state handling Use simpler callbacks to collect linkrev nodes.

bundle-ng: simplify bundle10.generate Remove complex local sub-functions mutating function-global variables. Simplify counting used for progress output.

shrink: delete extension preventing further refactoring (BC) Reordering can be done by setting bundle.reorder to true and doing a clone --pull.

bundle-ng: move bundle generation to changegroup.py

bundle-ng: unify _changegroup and _changegroupsubset Refactor the two changegroup generation interface to share as much code as possible.

bundle-ng: move gengroup into bundler, pass repo object to bundler No semantic changes made.

bundle-ng: add bundlecaps argument to getbundle() command

bundle-ng: move group into the bundler No additional semantic changes made.

bundle-ng: move bundler creation up in the stack Create a simple start() method to pass the lookup function until bundler becomes smarter and gets a repo object. Since we now create the bundler for the whole lifetime, we need to pass it down to revlog methods.

i18n: fix untranslated prompts with translated responses (issue3936)

help: stop documentation markup appearing in generated help Markup for links to mercurial commands is appearing in the help documentation. This patch fixes the markup so mercurial command reference links are correctly generated in the help documentation.

merge with stable

ui: use util.sizetoint in configbytes

util: migrate fileset._sizetoint to util.sizetoint The size counting code introduced in 2c4cd1c42365 duplicated existing (but unknown-to-me) code in fileset, so prepare to eliminate the duplication.

Added signature for changeset ddc7a6be2021

Added tag 2.6.1 for changeset ddc7a6be2021

dirstate.status: avoid full walks when possible

dirstate.walk: add a flag to let extensions avoid full walks Consider a hypothetical extension that implements walk in a more efficient manner and skips some known-clean files. However, that can only be done under some situations, such as when clean files are not being asked for and a match.traversedir callback is not set. The full flag lets walk tell these two cases apart.

merge with stable

i18n: fix partially-translated prompts (issue3928) (issue3929)

merge with i18n

i18n-pt_BR: synchronized with 27013ace80eb

pathencode: grow buffers to increase safety margin

merge with stable

help/config: note 64-bit Windows registry key used with 32-bit Python Before this patch the only place that documented the use of a different registry key was on the wiki page for installing on Windows from sources, while most users will use a pre-packaged installer and the supplied help files. This patch documents in the supplied help files that an alternate registry key is used for the installation/system configuration file when using 32-bit Python on a 64-bit Windows.

httpclient: upgrade to fe8c09e4db64 of httpplus

splicemap: support paths with spaces in splicemap (issue3844) Shlex module was used to split line as suggested. Split operates in POSIX mode.

branch: strip whitespace before testing known branch name Because dirstate._branch() strips leading/trailing spaces from .hg/branch, "hg branch ' foo '" should abort if branch "foo" exists in another head. tag command had a similar bug and fixed by 3d0a9c8d7184.

merge with stable

copies: refactor checkcopies() into a top level method This moves checkcopies() out of mergecopies() and makes it a top level function in the copies module. This allows extensions to override it. For example, I'm developing a filelog replacement that doesn't have rev numbers so all the rev number dependent implementation here needs to be replaced by the extension. No logic is changed in this commit.

store: move top file walk to a separate function Some extensions find it useful to be able to walk the non-data files in the repo, so I'm moving that part of the walk to a separate function. In particular, this allows an extension to interact with only the non-filelog store data (for instance, when cloning everything but filelogs).

clone: move file stream walk to a separate function Moves the file walk out of the stream method so that extensions can override it. This allows an extension to decide what files should be streamed, and in particular allows a stream without filelogs.

dirstate._walkexplicit: inline dirsnotfound.append

dirstate._walkexplicit: rename work to dirsfound Now that this code is factored out, work is too specific a name.

dirstate.walk: refactor explicit walk into separate function This enables this code to be reused by extensions that implement the other, more time-consuming bits of walk in different ways.

dirstate.walk: pull skipstep3 out of the explicit walk code This is a move towards factoring out this code into a separate function.

dirstate.walk: move dirignore filter out of explicit walk code This is a move towards factoring this code out into a separate function.

dirstate.walk: maintain a list of dirs not found Upcoming patches will factor out the walk over explicit files done in step 1. This helps us get there.

highlight: fix page layout with empty first and last lines Repeated newlines were stripped by pygmentize, now give the option not to do so.

check-code: add another Windows pathsep rule

merge with stable

tests: quiet strip to avoid commandserver pathsep issue

tests: fix another Windows path issue

tests: fix unionrepo path issue on msys (issue3927)

merge with stable

blackbox: fix literal block syntax

largefiles: check unknown files with case awareness of the filesystem Before this patch, largefiles extension checks unknown files in the working directory always case sensitively. This causes failure in updating from the revision X consisting of '.hglf/A' (and "A" implicitly) to the revision Y consisting of 'a' (not ".hglf/A") on case insensitive filesystem, because "A" in the working directory is treated as colliding against and different from 'a' on the revision Y. This patch uses "repo.dirstate.normalize()" to check unknown files with case awareness of the filesystem.

largefiles: check existence of the file with case awareness of the filesystem Before this patch, largefiles extension always unlinks largefiles untracked on the target context in merging/updating after updating working directory. For example, it is assumed that the revision X consists of ".hglf/A" (and "A" implicitly) and revision Y consists of "a" (not ".hglf/A"). In the case of updating from X to Y, largefiles extension tries to unlink "A" after updating "a" in working directory. This causes unexpected unlinking "a" on the case insensitive filesystem. This patch checks existence of the file in the working context with case awareness of the filesystem to prevent from such unexpected unlinking. "lfcommands._updatelfile()" also unlinks target file in the case "largefile is tracked in the target context, but fails to be fetched". This patch doesn't apply "repo.dirstate.normalize()" in this case, because it should be already ensured in the manifest merging that there is no normal file colliding against any largefiles.

windows: check target type before actual unlinking to follow POSIX semantics Creation and writing into target file via vfs (a.k.a opener) is done after "unlink()" target file, if it exists. For example, it is assumed that the revision X consists of file 'A', and the revision Y consists of file 'A/B'. Merging revision X into Y tries to "unlink()" on directory 'A' of 'A/B', before creation of file 'A'. On POSIX environment, directories should be removed by "rmdir(2)", and "unlink(2)" on directories fails. "unlink()" of Mercurial (and Python) uses "unlink(2)" directly, so unlinking in the merge case above would fail. In the other hand, on Windows environment, "unlink()" of Mercurial tries to rename before actual unlinking, to follow POSIX semantics: already opened file can be unlinked safely. This causes unexpected success in unlinking in the merge case above, even though directory 'A' is renamed to another. This confuses users. This patch checks whether target is directory or not before renaming, and raises IOError(errno.EPERM) if so, to follow POSIX semantics.

Merge with stable.

manifestmerge: local unknown, remote created: don't traverse symlinks To figure out what to do with locally unknown files, Mercurial attempts to read them if they exist. When an attempt is made to read a file that exists but traverses a symlink, Mercurial aborts. With this patch, we first ensure that the file doesn't traverse a symlink before opening it. This is fine because a file being "remote created" means the symlink doesn't exist remotely, which means it will be deleted in the apply phase.

subrepo: open files in 'rb' mode to read exact data in (issue3926) Before this patch, "subrepo._calcfilehash()" opens files by "open()" without any mode specification. This implies "text mode" on Windows. When target file contains '\x00' byte, "read()" in "text mode" reads file contents in without data after '\x00'. This causes invalid SHA1 hash calculation in "subrepo._calcfilehash()". This patch opens files in 'rb' mode to read exact data in.

patch: use scmutil.marktouched instead of scmutil.addremove addremove required paths relative to the cwd, which meant a lot of extra code that transformed paths into relative ones. That code is now gone as well.

scmutil: add a function to mark that files have been operated on Several places use scmutil.addremove as a means to declare that certain files have been operated on. This is ugly because: - addremove takes patterns relative to the cwd, not paths relative to the root, which means extra contortions for callers. - addremove doesn't make clear what happens to files whose status hasn't changed. This new method accepts filenames relative to the repo root, and has a much clearer contract. It also allows future modifications that do more with files whose status hasn't changed.

scmutil.addremove: factor out code to mark added/removed/renames An upcoming patch will reuse this code in another function.