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

subrepo: refactor writestate for clarity

cmdutil: make private copies of option lists to avoid sharing monkeypatches

record: fix options placeholder

subrepo: bare git repos considered dirty Currently, if there is a bare git subrepo, but it is at the "right" revision, calling dirty() will error because diff-index does not work on bare repos. This patch makes it so bare subrepos are always considered dirty.

dispatch: use the request to store the ui object and check if we got one before creating. note that the contents of the ui object might change after dispatch() returns (by options passed through --config for example), to ensure it doesn't, pass a copy() of it.

dispatch: wrap dispatch related information in a request class currently only stores the arguments.

patch: restore the previous output of 'diff --stat' Restore the previous diffstat behaviour of scaling by the maximum number of changes to a single file. Changeset f03f08240c32 modified the diffstat to be scaled by the total number of changes. This seems to have been unintentional.

wireproto: enable optional args for known() for future extensibility Firstly, I think we should do this for all new wire commands, just to be on the safe side. So I want to get this into the 1.9 release. Secondly, there actually is potential here that sometimes the server can know that the number of its nodes which can possibly still be undecided on the client is small. It might then just send them along directly (cutting short the end game). This, however, requires walking the graph on the server, which can be expensive, so for the moment we're not actually doing it.

context: make forget work like commands.forget Switch users of wctx.delete(..., False) to forget.

dirstate: rename forget to drop It has substantially different semantics from forget at the command layer, so change it to avoid confusion. We can't simply combine it with remove because we need to explicitly drop non-added files in some cases like commit.

minirst: read test input from stdin

tests: update monotone version requirement

test-git-import: test patching existing copy targets

httprepo: handle large lengths by bypassing the len() operator

workingctx.remove: don't stat files again after unlinking we already know at this point that they have been unlinked

httprepo: send URL redirection notices to stderr (issue2828)

record: alias qrecord to qnew -i/--interactive

record: add qrefresh -i/--interactive interactively select changes to refresh

record: add an option to backup all wc modifications Also, don't create a backup dir if we have no files to backup. This is essential for qrefresh --interactive. Since we can't select individual files to qrefresh without eliminating already present changes, we have to backup all changes in the working copy to avoid refreshing unaccepted hunks. (thanks to Patrick for the idea)

record: check patch name is valid before prompting in qrecord

mq: use checkpatchname This also fixes a bug where qrename would allow renaming a patch to a reserved name.

mq: wrap patch file name checks in a function

pure parsers: properly detect corrupt index files This new Python code should be equivalent in behavior to the if statement at line 312 of parsers.c. Without this, the pure-python parsers improperly ignore truncated revlogs as created in test-verify.t.

workingctx: unlink paths while holding the wlock

wireproto: do not hash when heads == ['force'] Changeset 88f0e41d8802 introduced the unbundlehash capability and unconditionally hashed the heads on the client side. By mistake, the heads were also cased in the heads == ['force'] case.

patch: remove EOL support from linereader class This was only used when reading patched files which is now done by backends.

subrepo: handle local added subrepo case correctly

graphlog: remove unused arg from _wrapcmd

extensions: raise when trying to find an extension that failed to load extensions that depend on other extensions (such as record) use this pattern to check if the dependant extension is available: try: mq = extensions.find('mq') except KeyError: return but since if an error occurs while loading an extension it leaves its entry in the _extensions map as None, we want to raise in that situation too. (rather than adding another check if the return value is None)

remove: clarify help text about added files never being deleted from disk

pure: provide more correct implementation of posixfile for Windows requires ctypes Why is posixfile a class? Because the implementation needs to use the Python library call os.fdopen [1], which sets the 'name' attribute on the Python file object it creates to the mostly meaningless string '<fdopen>', since file descriptors don't have a name. But users of posixfile depend on the name attribute [2] being set to a proper value, like Python's built-in 'open' function sets it on file objects. Python file's name attribute is read-only, so we can't just assign to it after the file object has alrady been created. To solve this problem, we save the name of the file on a wrapper object, and delegate the file function calls to the wrapped (private) file object using __getattr__. [1] http://docs.python.org/library/os.html#os.fdopen [2] http://docs.python.org/library/stdtypes.html#file.name

bundlerepo: make getremotechanges support filtering of incoming Extensions can hook discovery.findcommonincoming to filter out unwanted remote changesets. This patch makes getremotechanges respect the changed remote heads returned by such extensions.