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.

forget, remove: don't note on nonexistent file twice before: $ hg forget foo foo: No such file or directory not removing foo: file is already untracked after: $ hg forget foo foo: No such file or directory

localrepo: local() returns self Temporary measure for introducing peers

tests: avoid instability in test-convert-cvs-synthetic

dispatch: propagate ui command options to the local ui (issue2523) so the ui object passed to pre/post python hooks has the verbose flag (and the rest) set correctly

mq: catch correct exception when calling changelog.rev()

rebase: preserve mq series order after rebasing (issue2849)

run-tests: verbose log ignored test

record: add white space diff options

mq: rename abort_if_wdir_patched to abortifwdirpatched

mq: rename partial_name to partialname

mq: rename write_list to writelist

mq: rename series_dirty to seriesdirty

mq: rename applied_dirty to applieddirty

mq: rename guards_dirty to guardsdirty

mq: rename active_guards to activeguards

mq: rename guards_path to guardspath

mq: rename status_path to statuspath

mq: rename series_path to seriespath

mq: rename series_end to seriesend

mq: rename full_series_end to fullseriesend

mq: rename check_reserved_name to checkreservedname

mq: rename check_localchanges to checklocalchanges

mq: rename check_substate to checksubstate

mq: rename check_toppatch to checktoppatch

mq: rename save_dirty to savedirty

mq: rename explain_pushable to explainpushable

mq: rename set_active to setactive

mq: rename set_guards to setguards

mq: rename check_guard to checkguard

mq: rename parse_series to parseseries

mq: rename find_series to findseries

mq: rename series_guards to seriesguards

mq: rename full_series to fullseries

paper, coal: display diffstat on the changeset page Displayed in a row of the changeset summary table, underneath the list of files. When the page is loaded, only the diff summary is displayed. The full diffstat is only displayed when the [+] link is selected.

web: provide diff summary to the changeset page This is the same message displayed at the end of the "diff --stat" command. For example, "9 files changed, 1651 insertions(+), 2 deletions(-)". The webutil.diffstatgen function allows the diffstat data to be lazily calculated only once and then re-used.

tests: fix up date ambiguity in cvs test

hg: split peer and repo lookup tables

tests: rename test-git-import.t into test-import-git.t This is consistent with other test-import* tests.

patch: generalize the use of patchmeta in applydiff() - Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta instances in applydiff() makes things simpler. - Rename selectfile() into makepatchmeta(). It is responsible for creating patchmeta for regular patches. - Pass patchmeta objects to patchfile() directly patchmeta instances were associated with git patches, for regular patches we had to pass additional variables to tell the patch intent to patchfile(). Instead, we generate patchmeta for regular patches and pass them. This will also help with patch filtering by matcher objects.

patch: stop updating changed files set in applydiff() This information is more correctly returned by backends. The extra updated file removed from test-mq-merge.t output came from changes from git patches being counted before being really applied in some cases.

patch: turn patch() touched files dict into a set

paper, coal: define the diffstat templates The templates output the filename, the total number of changes to the file and a bar graph of the adds and removes. The filename is a link into the diff output. The diffstat is not yet displayed, but it can be manually added to the changeset page template.

web: provide the file number to the diffstat templates This allows the diffstat templates to link into the diff output. For example, the URLs of the first three files within the diff are #l1.1, #l2.1, #l3.1.

web: include all files in the diffstat The webutil.diffstat function now returns a diffstat template for each file in the diff. It previously returned a template for each file returned by ctx.files() which did not work well for merge changesets.

hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)

bookmarks: recognize the current bookmark when the local encoding isn't UTF-8 The current bookmark is stored in bookmark.current, supposingly in UTF-8. But the call to encoding.fromlocal() is missing, therefore Hg is not able to recognize the current bookmark in the case that bookmark uses characters of which the bit stream is different between local encoding and UTF-8. For example, the Chinese version of Windows cmd uses gbk(cp936), not UTF-8. Therefore I won't be able to make a Chinese bookmark current. By wrapping mark in a encoding.fromlocal() call, the problem is solved.

distutils: Create MANIFEST.in instead of MANIFEST in Makefile When running 'python setup.py sdist' many files were omitted from the resulting tarball that are required for a complete build, including the .h file for the inotify extension due to a python2.7+ distutils bug. This would cause 'make dist' to fail to build a correct dist on python2.7 By building a MANIFEST.in that is the same as the old MANIFEST with 'include' at the start of each line will cause a correct MANIFEST to be built and used by distutils.

revert: is reverting file states, not just file contents e.g. x bit is reverted as well Also makes this paragraph more consistent with the preceding one, which already uses the term "state" (not "content").

hg: change various repository() users to use peer() where appropriate This gets all the easy cases (peers that aren't also used as repositories).

hg: have peer() call _lookup directly Note that this means that peers no longer call the extension repository setup hooks.

hg: add peer method

hg: add opts argument to clone for internal remoteui

hg: use capable instead of capabilities

fileset: basic pattern and boolean support debugfileset can now generate file lists for things like: "* and not hg*"

tests: fix updated monotone version requirement 0969d91fad5c only updated the comment, not the actual check.

check-code: catch misspellings of descendant This word is fairly common in Mercurial, and easy to misspell.

revert: drop obvious paragraph about filenames

revert: actually add pointer to backout

revert: replace mention of 'roll back' with pointer to 'backout'

revert: simplify description of effect of -r

revert: rearrange the date help