tests: glob version number in test-hgrc

web: provide diffstat to the changeset page This includes all affected files, so it can be used for an extended view of the files or as a replacement for the filenodelink and filenolink templates.

tests: update for handling of missing hgrc includes

subrepo: svn abort now depends on exit code (issue2833)

fixed issue2833: aborts nows depends on svn exit code

config: ignore include errors for nonexistent files

Make pull -u behave like pull && update Previously, pull would not update if new branch heads were received, whereas pull && update would move to the tipmost branch head. Also change the "crosses branches" abort in merge.update from "crosses branches (merge branches or use --check to force update)" to "crosses branches (merge branches or update --check to force update)" since it can no longer assume the user is running hg update.

requires: note apparent corruption

readrequires: provide easier to understand error message NEW: $ hg id abort: unknown repository format: requires feature 'foo' (upgrade Mercurial)! OLD: $ hg id abort: requirement 'foo' not supported!

introduce new function scmutil.readrequires for reading and parsing the .hg/requires file

merge with stable

merge with crew

merge with i18n

merge with stable

merge with hg-i18n

merge with hg-i18n

test-gendoc: update for new Russian translation

i18n-ru: branches-import translated

i18n-ru:bisect,backout,branch translated

i18n-ru: translated add, addremove, annotate, archive

i18n-ru:translation started,convert translated

i18n-pt_BR: synchronized with ab687820c4cc

subrepo: don't crash when git .hgsubstate is empty (issue2716)

mq: no need to make a copy of seriesopts the command decorator takes care of copying the options (introduced in 5b48ad1e7f1a)

workingctx.remove: use self.forget

commands: use repo.branchheads in heads command

commands: remove unused variable from heads command The b variable has not been needed since fd511e9eeea6. Renamed ls variable to bheads for clarity.

mq: print "'foo' 'bar'", not "['foo', 'bar']" when showing guards The internal list representation of guards was leaking into the output. The guards were always printed using repr(guard) and that style was kept. When "hg qguard -l" prints several guards for a patch, it does so by joining the names with " " and that style was used for the error messages too.

hg: remove underscores in clone function

hg-ssh: fix dispatch call to use dispatch.request() 08bfec2ef031 changed dispatch.dispatch() to accept a request object instead of a list of arguments

gendoc: config help topic is in hgrc.5, do not include it in hg.1

doc: improve merge between hgrc.5 and config help topic

doc: rebuild hgrc.5 man and HTML page when help/config changes

help/config: separate terms with a blank line This makes it easier for translators since they can then translate each term individually.

help/config: fix rendering of definition list Without the blank line, the minirst parser renders Term-1 Line-1 Line-2 Term-2 Line-1 as Term-1 Line-1 Line-2 Term-2 Line-1 because the second term is seen as a paragraph.

help: move part of hgrc.5 man page config help topic

hgrc.5: make minirst find headings correctly The minirst parser is stricter than Docutils here and require a blank after a heading. Otherwise the heading is classified as a paragraph.

run-tests: fix --blacklist (broken by 95715c2f90bf)

patch: do not patch unknown files (issue752)

patch: use temporary files to handle intermediate copies git patches may require copies to be handled out-of-order. For instance, take the following sequence: * modify a * copy a into b Here, we have to generate b from a before its modification. To do so, applydiff() was scanning for copy metadata and performing the copies before processing the other changes in-order. While smart and efficient, this approach complicates things by handling file copies and file creations at different places and times. While a new file must not exist before being patched a copied file already exists before applying the first hunk. Instead of copying the files at their final destination before patching, we store them in a temporary file location and retrieve them when patching. The filestore always stores file content in real files but nothing prevents adding a cache layer. The filestore class was kept separate from fsbackend for at least two reasons: - This class is likely to be reused as a temporary result store for a future repository patching call (entries just have to be extended to contain copy sources). - Delegating this role to backends might be more efficient in a repository backend case: the source files are already available in the repository itself and do not need to be copied again. It also means that third-parties backend would have to implement two other methods. If we ever decide to merge the filestore feature into backend, a minimalistic approach would be to compose with filestore directly. Keep in mind this copy overhead only applies for copy/rename sources, and may even be reduced to copy sources which have to handled ahead of time.

patch: refactor file creation/removal detection The patcher has to know if a file is being created or removed to check if the target already exists, or to actually unlink the file when a hunk emptying it is applied. This was done by embedding the creation/removal information in the first (and only) hunk attached to the file. There are two problems with this approach: - creation/removal is really a property of the file being patched and not its hunk. - for regular patches, file creation cannot be deduced at parsing time: there are case where the *stripped* file paths must be compared. Modifying hunks after their creation is clumsy and prevent further refactorings related to copies handling. Instead, we delegate this job to selectfile() which has all the relevant information, and remove the hunk createfile() and rmfile() methods.

commands.remove: don't use workingctx.remove(list, unlink=True) workingctx.remove(list, unlink=True) is unsuited here, because it does too much: it also unlinks added files. But the command 'hg remove' is specified to *never* unlink added files. Instead, we now unlink the files at the commands.remove level (if --after was not specified) and use workingctx.forget for all files. As an added bonus, this happens to eliminate a wlock acquire/release pair, since the previous implementation caused acquire wlock release wlock acquire wlock release wlock where the first pair of acquire/release was caused by the workingctx.forget call, and the second by the workingctx.remove call.

tests: add a test to check for duplicate command options

mq: allow --mq for qrecord

run-tests: fix --blacklist with jobs > 1 filter blacklisted tests before partitioning them to the children. maintains the 'Skipped...' output but not the 's'.

run-tests: slightly simplify blacklist check

coal: use preformatted text for descriptions (issue2835) The coal style was broken here by an earlier change to paper, which shares files.

rebase: add option --tool/-t for 'pull --rebase' This makes 'pull --rebase' consistent with the merge command, which already provides that option to control the merges