svn subrepos: work around checkout obstructions (issue2752) We do this by ensuring the working copy is clean and then blowing away the working copy and replacing it with one from the desired path. We could probably use 'svn switch' to do this more efficiently, but there's some subtle logic required to get that right and this is more likely to work reliably.

update: check wc.dirty() before setting overwrite=True merge.update() was missing a few dirtiness checks from workingcontext, including subrepo cleanliness checks. Using wc.dirty() instead of one-off checks for various forms of dirtiness will be significantly safer.

tags: don't allow environment errors to be raised from _writetagscache See https://bitbucket.org/tortoisehg/thg/issue/719

help/config: replace docutils markup

test-i18n, i18n-pt_BR: update test message This changes both a test and a translation, so I'm sending a patch; please let me know if I should push this directly to i18n instead.

config: undo change of empty line definition We don't allow spaces in front of comment markers

patch: make filestore store data in memory and fallback to fs

i18n: merge in latest Romanian translations

i18n-ro: synchronized with 3c7907dc95ca

i18n-ro: outstanding changes

help/config: quote config section names consistently

help/config: fix small typo

help/config: do not refer to config files as hgrc files

help/config: fix 'Mercurial' casing

revset: add desc(string) to search in commit messages Like keyword(), but does not search in filenames and users. No grepdesc() or descgrep() added, because it might be bad to introduce grepfoo() versions of too many string searches.

revset: update sorting of symbols

http: fix variable name in unexpected response message

serve: add --cmdserver option to communicate with hg over a pipe

localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT

log: do not display hidden changeset We add a --hidden option to display them.

hidden: Add ``hidden`` method for context

hidden: Add a hiddenrevs attributes to changelog. This attributes hold the set of all revisions that should be ommited by command and tools displaying changesets. This set is given as a hit. Command and tools are responsible to check it in order to filter they outpur. Code adding revisions to the set are responsible to the consistency of it's data.

config: handle comment lines in continuations (issue2854)

http: report unexpected unparsable push responses (issue2777)

dispatch: write shell alias output to ui out descriptor

commands: use ui descriptors when reading/writing from stdin/out

cmdutil: return a dummy, closable file object if it cannot be duped If the ui I/O descriptors aren't real descriptors, they cannot be duped. Instead, we return a wrapper object that behaves the same, and can be closed (by overriding close and doing nothing).

cmdutil: use ui descriptors in makefileobj

mq: use ui.fin when importing patch from '-'

cmdutil, logmessage: use ui.fin when reading from '-'

dagutil: fix missing import of i18n._

hgmanpage: adapt to Docutils 0.8 API change

manifest: use "\0" instead of "\000" Though both give the same result (a NUL byte), I found that I tend to read "\000" as "\0" + "00", which is something completely different. I did not change the occurance of "\000" in archival.py since there are other octal constants in that file.

commands: add pointer to bookmarks command in branch help

glossary: add entry for "Bookmark"

glossary: add entry for "Tag"

merge with i18n

i18n-ru: translated all standard commands and config-environment additional help topics

i18n-ru: translated push-rename

i18n-ru: translated parents-pull

setdiscovery: batch heads and known(ownheads) This means that we now discover both subset conditions (local<remote and remote<local) in a single roundtrip without ever constructing an actual sample (which takes a bit of client CPU).

wireproto: make a number of commands batchable Makes lookup, heads, known, branchmap, pushkey, and listkeys batchable. It could, for instance, be interesting to use this to batch calls to lookup when a pull or clone has multiple --rev arguments. The next patch is going to batch heads and known to slightly tune discovery.

wireproto: add batching support to wirerepository Adds the plumbing and wire call for batched execution, but does not batch-enable any methods yet.

wireproto: add basic command batching infrastructure Note that localbatch will not be used until we actually have a localpeer to use it with.

mq: make qrefresh/qfold keep wlock until saving patch status Because q.refresh() changes nodeid, .hg/patches/status gets invalid until q.savedirty(). This patch changes mq not to unlock repository of incomplete state.

bugzilla: fix typo in documentation

dispatch: fix for-loop variable name

notify: send changesets on 'outgoing' hook, updated doc

sslutil: Restore missing imports of socket and httplib to sslutil Two imports were omitted in the restructure of the code creating sslutil.py, socket and httplib are required when the 'ssl' module cannot be imported, restoring these imports allows mercurial to run on python2.4+2.5.

dispatch: assign I/O descriptors from the request to the ui

ui: use I/O descriptors internally and as a result: - fix webproto to redirect the ui descriptors instead of sys.stdout/err - fix sshserver to use the ui descriptors

dispatch: add I/O descriptors to the request

ui: add I/O descriptors

import: add --bypass option This feature is more a way to test patching without a working directory than something people asked about. Adding a --rev option to specify the parent patch revision would make it a little more useful. What this change introduces is patch.repobackend class which let patches be applied against repository revisions. The caller must supply a filestore object to receive patched content, which can be turned into a memctx with patch.makememctx() helper.

import: separate parents selection from working dir update This will be useful when patching without updating the dirstate

patch: extend filtestore to store an optional copy source This will help wrapping filestores in memctx.

paper/coal: use fixed width for diffstat +/- link The plus and minus characters are normally not the same width in a non-monospace font, and this made the line length change when the diffstat display was toggled. The square brackets are not rendered in a monospace font to ensure that they align with the parenthesis on the same line.

hg: rename opts argument to peeropts in clone This should make it clearer that the options are used with remoteui only and are not used otherwise in hg.clone.

hg: move peerschemes back to schemes This will avoid breaking things with extensions until peers are fully separated from repos.

hg: rearrange peer scheme lookup There is now only peer scheme lookup. Repository lookup goes through peer scheme lookup. When peer and repo types are finally separated, repo lookup will use peer.local() to get a repository object. The underbar is dropped so that extensions can patch the table.