i18n: extract docstrings from fileset module

Backed out changeset 1ec8bd909ac3 Debug messages should not be translated.

merge with stable

dispatch: translate alias debugging messages

parsers: fix localization markup of parser errors

fileset: use correct function name for hgignore in docstring docstring refereed to "resolved" instead of "hgignore"

url: catch UNC paths as yet another Windows special case (issue2808)

treediscovery: always return all remote heads Old discovery only returned incoming heads, not all of them (for changegroupsubset). New discovery must always return all of the remote heads (for getbundle). I failed to properly adjust treediscovery in cb98fed52495 when introducing setdiscovery. The actual observable problem was 'remote: unsynced changes' when trying to push a cset on one named branch to a server with a new cset on another named branch. This scenario is now tested in test-treediscovery.t.

merge with stable

config.sortdict: override clear method Overrides dict.clear. It's not currently used, but was broken for sortdict. Contributed by Stepan Koltsov <yozh@mx1.ru>

patch: fix typo in variable name

merge with stable

help/revsets: revset aliases can be defined on any config file

help/revsets: clean up whitespace between paragraphs

help/config: mention [revsetalias] section

fileset: add missing whitespace around operator

fileset: drop backwards SI size units - the power of 2 ones should be kiB, MiB, etc. - the power of 10 ones (SI standard) should be kB, MB, but we're currently using the industry traditional units elsewhere

remove bogus test copy

merge default branch into stable to mark the start of the code freeze

fileset: add a help topic Add crosslinking with patterns topic.

fileset: add copied predicate

fileset: add encoding() predicate

fileset: add size() predicate

fileset: add grep predicate

fileset: add some function help text

fileset: add hgignore

fileset: add resolved and unresolved predicates

fileset: prescan parse tree to optimize status usage We only call status if needed to avoid walking the working directory or comparing manifests. Similarly, we scan for whether unknown or ignored files are mentioned so we can include them.

fileset: add support for file status predicates This forcibly walks the tree looking for unknown and ignored files, which is suboptimal. A better approach would scan the tree first to find required status components and skip the status check entirely if it's unused.

fileset: add some basic predicates

match: introduce basic fileset support

match: allow passing a context object to match core

fileset: drop matchfn This is now built into contexts

scmutil: match no longer accepts repo objects

scmutil: switch match users to supplying contexts The most appropriate context is not always clearly defined. The obvious cases: For working directory commands, we use None For commands (eg annotate) with single revs, we use that revision The less obvious cases: For commands (eg status, diff) with a pair of revs, we use the second revision For commands that take a range (like log), we use None

scmutil: match now accepts a context or a repo

context: add a match builder method This is groundwork for matching against filesets in contexts

help/hgignore: refer to the builtin help instead of external URLs

sslutil: make messages for Python without certificate handling more helpful We now explain why there is no certificate to verify and do not give hints about cacerts when they can't be used anyway.

sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798) Any entries in subjectAltName would prevent fallback to using commonName, but RFC 2818 says: If a subjectAltName extension of type dNSName is present, that MUST be used as the identity. Otherwise, the (most specific) Common Name field in the Subject field of the certificate MUST be used. We now only consider dNSNames in subjectAltName. (dNSName is known as 'DNS' in OpenSSL/Python.)

merge with i18n

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.

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

revert: remove some redundancy in basic description

revert: drop requirement to use -r to revert with two parents This reduces documentation confusion between the need to: a) hg revert -a -r . (drop all changes from a merge) b) hg up -C . (drop the second parent entirely) Currently revert is one of two commands (the other being tag) that still complains about uncommitted merges, dating from its former use of a generic defaultrev function that aborted.

revert: simplify usage note This points people looking for other commands to the right place with a minimum of verbiage.

revert: rewrite help summary New users have a tendency to mistake 'revert' as the command to use to check out old revisions. They also occasionally mistake revert for a generalized undo (compare rollback). This version intentionally aims to avoid mentioning 'earlier' and thus intentionally no longer alludes to the (secondary) -r behavior (which in fact is not actually limited to 'earlier'). Instead, we mention checkout state, to convey that we can restore things to the way they were when checked out.

extensions: make disabled()/disabledext() load prebuilt index if available __index__ contains a dict of {name: desc} of all extensions.

setup: add command to generate index of extensions It generates prebuilt index of all extensions, which will be used by frozen exe when running 'hg help extensions'. Now py2exe invokes this command automatically.

sshrepo: fix addchangegroup's signature Make it mirror the usage found in localrepo.push. This should only affect pushes to pre-unbundle ssh servers.

subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844) We shouldn't try to process subrepos if .hgsub isn't present and we should remove .hgsubstate if .hgsub is marked for removal.

patch: dot not ignore hunk of files marked as 'deleted' git 'deleted' flag was processed unconditionnally and the file removed even if the related hunk was not matching.

patch: fix patchmeta/hunk synchronization in iterhunks() Synchronizing on bfile does not work on file removal where bfile is /dev/null. We match items on afile or bfile instead. The incorrect code makes iterhunks() to emit patchmeta and hunks separately in some cases. This is currently hidden by applydiff() being too tolerant when processing patchmeta, and will be fixed later.

patch: remove unnecessary exists() call in selectfile()

import: deprecate --base This option was a convenient hack introduced in Mercurial early days which unfortunately survived until now.

patch: remove redundant islink() call

extensions: update doc of enabled() and disabled() according to d5b525697ddb

localrepo: add savecommitmessage() to write last-message.txt

memctx: simplify constructor

scmutil: improve path calculation for install-relative RC files (issue2841) This code was ugly and might do the wrong thing with symlinks.

prepush: show details about new remote heads with --verbose previously, this info was only shown with --debug Note that the new remote heads are only shown if the command aborts, that is, they are *not* shown if --force was specified. See also change 91cb08a9e7fb.

prepush: print short hash of first new head in abort message and don't mention the branch if it's the default branch. OLD: $ hg push ../a pushing to ../a searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) NEW: $ hg push ../a pushing to ../a searching for changes abort: push creates new remote head 1e108cc5548c! (you should pull and merge or use push -f to force) This helps to identify which local head is causing troubles. See also change 91cb08a9e7fb.

prepush: eliminate 'if branch' branch is always set anyway No change in program behavior.

revlog: bail out earlier in group when we have no chunks

localrepo: simplify file bundling code and fix progress bug Progress for files was off by one, and the code was rather hackish.

localrepo: use list comprehension instead of generators The lists in question are iterated and kept in memory further down the code path anyway, and this simplifies things.

localrepo: add total to changeset progress in bundle/push

statichttprepo: use in-place difference for shorter line

workingctx: eliminate remove function Inlining it into it's last remaining call place in cmdutil.copy. Note that cmdutil.copy is called with the wlock already held, so no additional locking is needed to call util.unlinkpath. We do not need to wrap the util.unlinkpath call into a try block, because at that point we already know whether abssrc exists or not -- thanks to the preceding util.copyfile call. Adding a new local 'srcexists' in cmdutil.copy for that purpose.

test-copy2: add case for moving a missing file

color: check if ui is already a subclass of colorui before wrapping it since it's possible to reuse the ui object (see 80c599eee3f3) between dispatch calls, the ui might have been wrapped already. we could probably move this test up a bit but leaving it here allows updates to take effect by extstyles() and configstyles().

util: add helper function isatty(fd) to check for tty-ness

web: prevent TypeError thrown when using the diffstat templates Remove the lambda used to wrap webutil.diffstat because: - functions passed to the templater must accept keyword arguments - webutil.diffstat is a generator, so already calculates the diffstat lazily This reverts the changes made to 1d3e2349304a after it was submitted to the mailing list but before it was queued.

fileset: fix long line

COPYING: refresh with current address from fsf.org

filesets: introduce basic fileset expression parser

dispatch: add repo to the request allows callers of dispatch.dispatch to pass in an initialized repo object to be used. -R/--repository overrides the request repo.

merge with stable

Added signature for changeset 733af5d9f6b2

Added tag 1.8.4 for changeset 733af5d9f6b2

subrepo: make stdin for svn a pipe for non-interactive use (issue2759) This certainly can't hurt, so go ahead and do it, potentially along with --non-interactive if that flag is safe for the given subcommand.

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

httprepo: send URL redirection notices to stderr (issue2828)

httprepo: proper handling of invalid responses without content-type (issue2019) This can currently be tested on http://sf.net/

strip: make it clear that --force discards changes (issue310)

tags: catch more corruption during cache parsing (issue2779)

localrepo: don't add deleted files to list of modified/added files (issue2761) If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.

localrepo: ignore tags to unknown nodes (issue2750)

bookmarks: do not forward merged bookmark (issue1877)

rebase: restore mq guards after rebasing (issue2107) Guards on rebased mq patches were lost. This patch restores them after the qimporting step.

revset: report a parse error if a revset is not parsed completely (issue2654)

color: fix --color=always when output is piped Also restructures the mode determination as discussed on IRC. I tried to simplify the code too, while keeping the original semantics except for the case of --color=always.

check-code: flag 0/1 used as constant Boolean expression

run-tests: allow whitelisting tests that should always run It's desirable to run some tests all the time, for example test-check-pyflakes.t and test-check-code-hg.py. This allows passing --whitelist as a path to a file (flag can be specified more than once) which contains a list of files to whitelist. Whitelisted tests are run even if they're blacklisted or wouldn't match a --keyword test run. For example, to do a quick test of usehttp2, one can now do $ cat > test-whitelist <<EOF > test-check-pyflakes.t > test-check-code-hg.py > EOF $ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true' > -k http -j 8 --whitelist test-whitelist) and have all http-specific tests run as well as the two code linters.

subrepo: make stdin for svn a pipe for non-interactive use (issue2759) This certainly can't hurt, so go ahead and do it, potentially along with --non-interactive if that flag is safe for the given subcommand.

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