tests: unify test-debugrename

tests: unify test-confused-revert

tests: unify test-command-template

mq: rename strip --nobackup option to --no-backup (issue2377) Same option name as for hg revert --no-backup. Deprecate strip --nobackup.

mq: consistently use opts.get() to prevent potential KeyError

tests: remove exec bit from .t files

combine tests

merge with stable

color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.

i18n: unmark untranslatable string

test-subrepo-recursion: test missing subrepo

incoming: recurse into subrepositories with --subrepos/-S flag As with push and outgoing, the optional source path is ignored for the subrepositories. Fixing this is Issue1852.

incoming: move code from commands to cmdutil This makes it easier to reuse it in a recursive fashion for subrepos.

outgoing: recurse into subrepositories with --subrepos/-S flag As with push, the optional destination path is ignored for the subrepositories, i.e., they are always compared with their default push path. Fixing this is Issue1852.

outgoing: move code from commands to cmdutil This makes it easier to reuse it in a recursive fashion for subrepos.

add: recurse into subrepositories with --subrepos/-S flag

add: move main part to cmdutil to make it easier to reuse

narrowmatcher: propagate bad method The full path is propagated to the original match object since this is often used directly for printing an error to the user.

narrowmatcher: fix broken rel method

patch: break import cycle with cmdutil The patch module imported cmdutil but used it only in updatedir.

patchbomb: show progress when sending emails or writing mbox

patchbomb: consistent code style in getaddrs()

win32: 64-bit Inno Setup installer

win32: update Inno Setup build instructions with up-to-date software

merge with stable

tests: unify test-merge-remove

tests: unify test-merge-prompt

tests: unify test-merge-local

tests: unify test-merge-internal-tools-pattern

tests: unify test-merge-force

tests: unify test-merge-default

tests: unify test-merge-commit

tests: unify test-manifest*

convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354) Given a commit author or message with non-ASCII characters in a darcs repo, convert would raise a UnicodeEncodeError when adding changesets to the hg changelog. This happened because etree returns back unicode objects for any text it can't encode into ASCII. convert was passing these objects to changelog.add(), which would then attempt encoding.fromlocal() on them. This patch ensures converter_source.recode() is called on each piece of commit data returned by etree. (Also note that darcs is currently encoding agnostic and will print out whatever is in a patch's metadata byte-for-byte, even in the XML changelog.)

merge with crew

tests: fix incompatibility with python-2.4 in test-hgweb Thanks to lcantey for catching it.

merge with stable

merge with i18n-default

merge with i18n-stable

i18n-pt_BR: fix a couple of typos

i18n-pt_BR: added messages from crew stable up to 26d86a6cf2af

i18n-ro: merged default

i18n-ro: ongoing translation

i18n: merged in strings from hg cset ce818cf215dc

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

i18n-ro: ongoing translation

Continued translation

i18n-ro: ongoing translation

i18n-de: fix awkward translation of "memory"

i18n-da: fix typo

i18n: merge with stable

i18n: merge default heads

i18n-pt_BR: synchronized with 9617803b1acb

i18n: merge with stable

i18n: merge default heads

i18n-pt_BR: synchronized with c6b1be675d3c

i18n: merge with stable

i18n: merge with stable

i18n: merged stable heads

i18n-it: finish translating 'hg summary' output

i18n-it: remove bogus fuzzy translations for revset The translations were all random fuzzy strings, which can only do harm, so remove them. Moreover, given the status of revset (it seems mostly an internal undocumented module, and to understand it you need the source anyway), I prefer not to translate it for now.

i18n-it: update fuzzy messages/translate patchbomb

i18n-it: update mq translation Significant updates were performed - when translating something, I tried to choose a term and use it consistently everywhere possible, so here I translated a lot of messages. Additionally, I use the mq extension a lot, and now I am using the translation, so I will be able to translate it better.

i18n-it: updates after msgmerge on stable branch, 2nd part

i18n-it: general updates fuzzy synopsis texts This patch follows the fix on the translation of [OPTION]... with other needed updates on the same class of messages.

i18n-it: translate [OPTION]..., not [OPTIONS]...: keep the singular Since [OPTION]... is intended to mean more options, it was translated in Italian as plural. However the plural is conveyed by `...', so switch to the singular. This was also useful because for the '-o OPT' extdiff option, I have to translate `OPT' as a singular.

i18n-it: readd other lost accented characters The problem was introduced already in revision 9f9137cd83f5 by the original Italian translator, according to logs. This might be due to a bug in the program he used, "Lokalize 0.3", or maybe not - some accented characters exist also in that commit.

i18n-it: updates after msgmerge on stable branch

i18n-it: perform msgmerge on the tip of the stable branch

i18n-pt_BR: synchronized with 31dde4c3bb83

dirstate: use one pass to filter out files in subrepos

subrepo: handle diff with working copy We cannot unconditionally call bin(node2) since node2 is None when comparing with the working copy.

subrepos: handle diff nodeids in subrepos, not before Subversion nodeids are integer revisions.

mq: add newline after qfold warning

merge with stable

tests: unify test-locate

tests: unify test-journal-exists

tests: unify test-issue1438 and test-issue2137

keyword: explain file-wise expansion in help

convert: move -A option to --authormap

patchbomb: add --confirm option to show series details and ask for confirmation --confirm presents same prompt as --diffstat, but does not write a diffstat to the messages' bodies. A simple test simulating a negative response is included.

patchbomb: let diffstat prompt only once with complete summary This changes the behaviour of --diffstat. Before the user was asked for confirmation of each patch with its description and diffstat, and a final summary. Now there is only one prompt right before sending with a final summary which does not include the patch descriptions, but the message details and the diffstats: Final summary: From: sender To: recipient(s) Cc: (if present) Bcc: (if present) Reply-To: (if present) Subject: [patch 0 of x [flags]] intro (if present) a | 28 ++++++++++++++++++++++++++++ b | 15 +++++++++++++++ Subject: [patch 1 of x [flags]] subject a | 28 ++++++++++++++++++++++++++++ [ ... ] are you sure you want to send (yn)?

patchbomb: rename argument to avoid shadowing patch module

convert: deprecate --authors in preference for --authormap This aligns the authormap option with the other three mapping options. The old --authors option is still supported and 'hg help convert -v' will still show it.

patchbomb: show prompt and selection in non-interactive mode Akin to 01ada7b1861d for the custom patchbomb prompt.

patchbomb: use ui.promptchoice for diffstat to allow localization of choices The extra check for ui.interacive from patchbomb's prompt function is not needed here. Format boolean prompt as in filemerge.py.

tests: unify test-issue*

tests: unify test-globalopts

tests: unify test-git-*

tests: unify test-filebranch

tests: unify test-extension

tests: unify test-execute-bit

tests: unify test-empty-group

merge with stable

convert: better grouping of command line flags in help We normally put related command line flags after one another.

convert: help string cleanups

convert: better quoting in help text

convert: show example splice, author, and branch map entries in help Also document that - empty lines are skipped and comment are supported in author map - whitespace is not allowed in branch map entries since we split on it when parsing the file

hgweb: support very simple caching model (issue1845)

tests: extend get-with-headers to support cache testing

tests: fix test output for test-hgweb-no* tests

tests: rename test for better grouping

check-code: fix ternary expression introduced in 1ef9b0b5efec

bisect: warn about ending on a merge with only one side marked

bisect: allow revsets in addition to single revs (issue2360)

subrepos: add function for iterating over ctx subrepos

subrepos: handle modified but uncommitted .hgsub

localrepo: check nested repos against working directory This checks against what is really in the filesystem, including subrepositories that have been added to .hgsub but not yet committed.

add: clarify that repo[None].add returns rejected filenames

merge with stable

store: Removed extra space in _data list

verify: fix "missing revlog!" errors for revlog format v0 and add test With revlog format v0 the .d files are empty if the only revision stored is an empty file. Since Mercurial can no longer create format v0 repositories, but still use it, add a script which creates a repository with a single empty file. This can be used in other tests if wanted.

zsh completion: bookmarks support

zsh completion: patchbomb support

diff: recurse into subrepositories with --subrepos/-S flag

status: recurse into subrepositories with --subrepos/-S flag

match: add narrowmatcher class This class can be used to adapt an existing match object to a new match object that only cares about paths within a certain subdirectory.

cmdutil: use repo.auditor when constructing match object This gives the repository control over which nested repository paths that should be allowed via the custom path auditor. Since paths into subrepositories are now allowed, dirstate.walk must now filter away more paths than before.

match: accept auditor argument This is used when normalizing filenames and patterns.

localrepo: add auditor attribute which knows about subrepos

tests: remove unneeded -u flags

merge with stable

tests: unify test-empty-file

tests: unify test-empty-dir

tests: unify test-dispatch

tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.

test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments

test-merge5: ensure updating to tip across branches is tested When doing "hg update" across branches (without any revision specified), hg will abort and ask the user to merge or do hg update -c. This tests for that error.

test-convert-cvs: add a sleep to make test more stable The recent addition of fuzzy tests introduced a new cvs commit which sometimes fails. This adds a sleep to make sure that cvs notices that the file has changed, similar to how it is done in other tests.

merge with stable

tests: unify test-diff-binary-file

tests: unify test-diff-copy-depth

tests: unify test-diff-upgrade

tests: unify test-convert-hg-startrev.

tests: unify test-diffstat

bookmarks: break long line found by check-code

help: make "hg help hgrc" an alias for "hg help config"

clone, patch, convert: use hex(nullid) instead of '0'*40

tests: unify test-diff-newlines

merge with stable

tests: unify test-diff-unified

tests: unify test-diff-subdir

tests: unify test-diff-reverse

tests: unify test-diff-ignore-whitespace

tests: unify test-diff-hashes

tests: unify test-diff-change

test-serve: ensure KILLQUIETLY is only used once 49463314c24f introduced a feature to the hgserve() function that suppresses errors from kill(1). It wrongly assumed that setting an environment variable when calling a function would make it local to the function. It ended up suppressing kill errors for every call thereafter. This patch sets KILLQUIETLY=N after use.

dagparser: translate and lowercase error messages

match: mark error messages for translation

debugindex(dot): try to access filelogs through repo, if possible If a repository is accesible, first treat the filename as a working copy file and try to open its filelog. Fallback to opening the file directly as a revlog, as before.

debugdata: try to access filelogs through repo, if possible If a repository is accesible, first treat the filename as a working copy file and try to open its filelog. Fallback to opening the file directly as a revlog, as before.

merge with stable

remove: properly set return code when warnings are issued This removes the warn() function in favor of issuing warnings directly for each kind of file that Mercurial won't remove. This also uses three separate translatable strings instead of using string formatting to build the message. This should make it easier to localize.

pull: lowercase error message

commit: sort subrepos before committing for stable test output

tests: unify test-interhg

test-custom-filter: heredoc is not required for single line operations

tests: unify test-custom-filters

tests: unify test-parse-date

tests: unify test-purge

tests: unify test-rebuildstate

tests: unify test-up-local-change

tests: unify test-impexp-branch

tests: unify test-incoming-outgoing

tests: unify test-resolve

tests: unify test-requires

tests: unify test-relink

tests: merge the two test-rename-dir-merge* into one

tests: unify test-rename-dir-merge2

tests: unify test-rename-dir-merge

tests: unify test-revert-unknown

tests: unify test-revert-flags

tests: remove useless sed in test-hgrc

tests: mq-safety: use regular expression instead of sed

tests: use regular expression instead of sed in test-subrepo-deep-nested-change

tests: unify test-revert

util: get rid of extra trailing whitespace in parsedate abort message

tests: unify test-revset

test-revset: remove trailing whitespaces

test-keyword: use regular expressions instead of grepping

tests: remove useless grep -v in test-mq.t

tests: unify test-remove-new

tests: unify test-remove

tests: unify test-rename

tests: unify test-strict

tests: unify test-inherit-mode

tests: unify test-churn

tests: convert test-bisect

alias: on --debug, print expansion when it has invalid arguments

alias: print what command is being shadowed in debug message

merge with stable

mail: use standard section.entry format in error message

color: accept usual boolean values as synonyms for always and never

parsebool: accept always as true and never as false

parsebool: create new function and use it for config parsing

util: clean up trailing whitespace

Consistently import foo as foomod when foo to avoid shadowing This is in the style of 5f091fc1bab7.

Merge with stable

help: refer to user configuration file more consistently Currently, a number of commands and help topics mention the user hgrc file in different ways. Among these are following: 1. .hgrc - "please specify your commit editor/username in your .hgrc file", bookmarks, color, hgk, pager, hg help environment 2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1) 3. ~/.hgrc - hgrc(5) In addition to being inconsistent, none of these make sense on Windows. This patch replaces the above with a more general term of "[your] configuration file".

tests: unify test-config-case

win32: add hgweb scripts to Inno Setup installer

win32: add Emacs scripts to Inno Setup installer

path_auditor: delegate checking of nested repos to a callback

util: use 'auditor' as consistent name for path auditors

util: add optional path auditor argument to canonpath The canonpath function will default to creating its own path auditor, but in some cases it will be useful to use a specialized auditor, e.g., one that wont abort if a path lies within a subrepository.

mail/hgweb: support service names for ports (issue2350) This adds util.getport(port) which tries to parse port as an int, and failing that, looks it up using socket.getservbyname(). Thus, the following will work: [smtp] port = submission [web] port = http This does not apply to ports in URLs used in clone, pull, etc.

tests: unify test-qrecord

tests: unify test-record

tests: unify test-help

tests: unify test-bheads

tests: unify test-lock-badness

Merge with stable

churn: do not crash on malformed lines in alias file

churn: do not crash on empty lines in alias file

Lowercase error messages

localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.

color: handle more Windows console errors If your application is being built as a non-console application, stdout is not a valid handle and raises an exception: pywintypes.error: (6, 'DuplicateHandle', 'The handle is invalid.') Alternatively, non-console applications launched outside of a console will return None from GetStdHandle instead of raising an exception.

patchbomb: remove unneeded line continuation

cleanup: remove unused variables

cleanup: remove unused imports

Merge with stable

subrepo: use [0-9] instead of [\d] in svn subrepo regex The \d was used in a normal (not raw) string and was only passed through to re.search because Python does not define that escape character itself. Using 0-9 makes it clearer what is happening.

webcommands: remove unncessary access to repo.changelog changectx are good enough in these cases and their interface is more stable.

archival: do not use repo.changelog directly

repair: pass variable explicitely to nested function

mercurial.spec: specify file modes for install

simplemerge: remove hash-bang from non-executable script

merge with stable

Added signature for changeset ff5cec76b1c5

Added tag 1.6.3 for changeset ff5cec76b1c5

util: avoid using hashlib on Python < 2.5 (issue2278) The following patch allows the use of python2.4 with a standalone hashlib rather than assuming that python2.5 is in use when hashlib is imported successfully.

templates: add filenolink to raw style (issue2332)

url: limit expansion to safe auth keys (Issue2328) Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the prefix and password keys may contain $-signs. So this only add the username to the list of keys that are expanded. This also updates the documentation to match.

url: expand vars in all [auth] settings (issue2328)

merge with stable

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.

bundlerepo: remove duplication of bundle decompressors

bundle: introduce bundle class

bundle: unify/refactor unbundle/readbundle

bundle: factor out decompressor

merge with stable

alias: make shadowing behavior more consistent (issue2054) Currently, given an alias like the following: [alias] summary = summary --remote The alias might be executed - or it might not - depending on the order of the cmdtable dict. This happens because cmdalias gets assigned back to the cmdtable like so: cmdtable['summary'] = ... Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd() chooses isn't deterministic. This patch makes cmdalias assign back to '^summary|sum'. It uses the same cmdtable key lookup that extensions.wrapcommand() does.

hgweb: handle exception of misconfigured path on index page If hgweb.config contains wrong path mapping, hgweb causes internal server error on repository index page. This patch changes makeindex() to ignore RepoError, because it looks to be designed to suppress configuration error.

statichttprepo: disable pushkey

mq: extend support for the --mq argument to extension commands This allows commands like `purge' to accept the --mq option.

repository: drop unused rjoin() method This method was introduced by cfeeac24fc1e but grepping the history does not reveal any call. Extensions may use it but the method intent is not even clear to me.

tests: unify test-export

revert: wrap long line

util: remove lexists, Python 2.4 introduced os.path.lexists

Merge with stable

context: mark string for translation