bundlerepo: drop unused close() method

bundle: make unbundle object seekable This is only for uncompressed bundles used by bundlerepo.

bundle: push chunkbuffer down into decompress We replace the fixup iterator with a file-like object so that uncompressed file streams can be passed end to end through the stack.

tests: fix a bunch of pointless #s in unified tests

tests: exit 0 no longer needed on unified tests

tests: update debugcomplete output

merge with abuehl

tests: unify some of test-mq*

subrepo: add support for 'hg archive'

subrepo: introduce files and filedata methods for subrepo classes

merge with stable

revset: handle re.compile() errors in grep() Raise error.ParseError instead of allowing re.error to bubble up.

archive: set date to 1980 for very old zip files The zip file format stores the date using "MS-DOS format" which apparently means that they use 1980 as their epoch. Python's zipfile module emits deprecation warnings of this form /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct integer overflow masking is deprecated self.fp.write(zinfo.FileHeader()) /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.fp.write(zinfo.FileHeader()) /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: struct integer overflow masking is deprecated self.z.close() /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.z.close() when it is given such old timestamps. This fixes this by silently clamping the date to 1980.

Merge with stable

test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.

tests: add exit codes to unified tests

merge with stable

merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.

transplant: maintain list of transplants in dict

tests: unify test-hgignore

win32: update build instructions with correct CRT version As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you compile an application with MSVC 2008 SP1 it is bound by default to the original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1. If the wrong CRT version is embedded in the Inno Setup installer, with a PC that does not have the MSVC 2008 redistributable package installed, hg will refuse to launch with an error: "the system cannot execute the specified program".

merge with crew

merge with crew

Merge with stable

eol: setup the repo.ui in reposetup() This fixes problems some have reported using the eol extension together with TortoiseHg. It ensures the ui associated with the repository has the preupdate.eol hook configured.

tests: unify test-hardlinks-safety

tests: unify test-extra-filelog-entry

tests: unify test-extdiff

tests: add test for bookmark push/pull

bookmarks: set VALUE in push/pull

tests: unify test-username-newline

tests: unify test-url-rev

tests: unify test-update-renames

tests: unify test-rename-merge1

merge with crew

clone: only use stream when we understand the revlog format This patch fixes issues with stream cloning in the presense of parentdelta, lwcopy and similar additions that change the interpretation of the revlog format, or the format itself. Currently, the stream capability is sent like this: stream=<version of changelog> But the client doesn't actually check the version number; also, it only checks the changelog and it doesn't capture the interpretation-changes and flag-changes in parentdelta and lwcopy. This patch removes the 'stream' capability whenever we use a non-basic revlog format, to prevent old clients from receiving incorrect data. In those cases, a new capability called 'streamreqs' is added instead. Instead of a revlog version, it comes with a list of revlog-format relevant requirements, which are a subset of the repository requirements, excluding things that are not relevant for stream. New clients use this to determine whether or not they can stream. Old clients only look for the 'stream' capability, as always. New servers will still send this when serving old repositories.

localrepo: factor out requirement application and write

merge with stable

merge with i18n

merge with i18n

l10n: starting to unify the old translations New status: 1525 messages complete with 135 fuzzies and 621 untranslated. Transmitted-via: Transifex (www.transifex.net).

l10n: translations: env. variables / templating system (DE) New status: 1517 messages complete with 134 fuzzies and 630 untranslated. Transmitted-via: Transifex (www.transifex.net).

l10n: added some new translations New status: 1443 messages complete with 130 fuzzies and 708 untranslated. Transmitted-via: Transifex (www.transifex.net).

i18n-pt_BR: synchronized with 0f6164806283

tests: unify test-default-push

tests: unify test-clone-update-order

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

test-convert-cvs: test fuzz

test-dispatch: drop test for missing working directory hstuart reported problems when the local Python has been configured to do stuff and crash before reaching the expected error handler.

Merge with stable

bookmarks: guard against listing bookmarks on unsupported repos This fixes clones and pulls from statichttprepository repos.

mdiff.patch(): add a special case for when the base text is empty remove the special casing from revlog.addgroup()

revlog: add rawsize(), identical to size() but not subclassed by filelog

revlog.addrevision(): move computation of nodeid in addrevision() The check "if node in nodemap" is already done earlier in addgroup().

contrib/compress: compress should activate parentdelta

contrib/compress: correct ordering of copying Changelog should always be copied last, otherwise readers can see an inconsistent repo.

contrib/compress: refactor revlog copying

contrib/compress: use store API instead of a collector

contrib/compress: proper lock handling Lock the src repo before beginning the compression and lock the destination repo before copying the revlogs. Proper handling of exceptions.

contrib/compress: use hg API to compute the destination path

contrib/compress: use repo's transaction method

contrib/compress: remove unused variables

tests: unify test-hgrc

tests: remove test-log.out, useless after unification

revlog: fix docstring

deltaparent(): don't return nullrev for a revision containing a full snapshot this allows us to simplify manifest.readdelta and revlog.revdiff

merge with stable

tests: fix up bisect test output

merge: move reverse-merge logic out of filemerge (issue2342)

bisect: add test for unrelated starting revisions

merge with stable

bisect: better message for unrelated starting revisions

debuginstall: report installpath

tests: unify test-glog

bookmarks: fix long line

merge with stable

revlog: addgroup re-adds punched revisions for missing parents While reading changegroup if a node with missing parents is encountered, we add a punched entry in the index with null parents for the missing parent node.

revlog: generate full revisions when parent node is missing The full revision is sent if the first parent, against which diff is calculated, is missing at remote. This happens in the case of shallow clones.

revlog.revision(): inline deltachain computation

revlog.revision(): remove debug code

revlog.revision(): don't use nullrev as the default value for the cache I is probably a bug if the deltachain computation think there was a cache hit at nullrev. Use None instead, this will never trigger a cache hit.

revlog.revision(): minor cleanup Rename some variables, making the name more obvious (in particular "cache" was actually two different variable. Move code around, moving the index preloading before the deltachain computation, without that index preloading was useless (everything was read in deltachain).

bookmarks: Check if the bookmark to delete exists on the remote

Merge with stable

win32: remove useless lstat() fallback in nlinks() The fallback was introduced by 3b4f05ff3130 at the same time than nlinks(). Apparently it only handles the case where target path does not exist. Just raise IOError directly.

win32: correctly break hardlinks on network drives (issue761) win32.nlinks() was often returning 1 instead of the correct hardlinks count when reading from network drives. This made commit or push to a repository on a network share to fail breaking the hardlinks in the datastore, possibly causing integrity errors in repositories linked locally on the remote side. Here is what the MSDN says about GetFileInformationByHandle(): Depending on the underlying network features of the operating system and the type of server connected to, the GetFileInformationByHandle function may fail, return partial information, or full information for the given file. In practice, we never got the correct hardlinks count when reading from and to many combinations of Window XP, 2003, Vista and 7, via network drives or RDP shares. It always returned 1 instead. The only setup returning an accurate links count was a samba on Debian. To avoid this, Mercurial now breaks the hardlinks unconditionally when writing to a network drive.

merge with stable

aliases: provide more flexible ways to work with shell alias arguments This patch changes the functionality of shell aliases to add more powerful options for working with shell alias arguments. First: the alias name + arguments to a shell alias are set as an HG_ARGS environment variable, delimited by spaces. This matches the behavior of hooks. Second: any occurrences of "$@" (without quotes) are replaced with the arguments, separated by spaces. This happens *before* the alias gets to the shell. Third: any positive numeric variables ("$1", "$2", etc) are replaced with the appropriate argument, indexed from 1. "$0" is replaced with the name of the alias. Any "extra" numeric variables are replaced with an empty string. This happens *before* the alias gets to the shell. These changes allow for more flexible shell aliases: [alias] echo = !echo $@ count = !hg log -r "$@" --template='.' | wc -c | sed -e 's/ //g' qqueuemv = !mv "`hg root`/.hg/patches-$1" "`hg root`/.hg/patches-$2" In action: $ hg echo foo foo $ hg count 'branch(default)' 901 $ hg count 'branch(stable) and keyword(fixes)' 102 $ hg qqueuemv myfeature somefeature

util: add an interpolate() function to for replacing multiple values util.interpolate can be used to replace multiple items in a string all at once (and optionally apply a function to the replacement), without worrying about recursing: >>> import util >>> s = '$foo, $spam' >>> util.interpolate(r'\$', { 'foo': 'bar', 'spam': 'eggs' }, s) 'bar, eggs' >>> util.interpolate(r'\$', { 'foo': 'spam', 'spam': 'foo' }, s) 'spam, foo' >>> util.interpolate(r'\$', { 'foo': 'spam', 'spam': 'foo' }, s, lambda s: s.upper()) 'SPAM, FOO' The patch also changes filemerge.py to use this new function.

convert: use encoding.encoding instead of locale.getpreferredencoding() The latter may not return useful results in certain OS X environments.

convert: properly set encoding for gnuarch converter

log: add logging for commands

ui: add logging hook

tests: unify test-merge10

tests: unify test-merge9

tests: unify test-merge8

tests: unify test-merge7

tests: unify test-merge6

tests: unify test-merge5

tests: unify test-merge4

tests: unify test-merge2

tests: unify test-merge1

tests: unify test-excessive-merge

tests: unify test-double-merge

tests: unify test-copy-move-merge

tests: unify test-merge-closedheads

merge with stable

color: enable branches support This commit updates the branches command to use ui.label for the branch names and the changeset. This implementation allows assigning colors to the four states of a branch: active, closed, current and inactive. While you can configure color for the four states, only current and closed have default colors of green and black bold respectively.

mq/qqueue: update bash completion

mq/qqueue: add --purge option to delete a queue and its patch dir qqueue --delete only deletes the reference to the queue, and leaves the associated patch directory behind. There is no Mercurial-way of getting rid of that patch directory afterward. This patch adds the --purge option to qqueue, that deletes the queue from the list, and also removes the associated patch dir. If the queue was non-existant, but the patch dir was, it is removed nonetheless. This is to avoid manual intervention in the .hg directory.

mq/qqueue: commonalise the queue deletion code

mq: don't inherit default and default-push paths with --mq (issue2333) Configuration from the outer repo is inherited to the patches repo when --mq is used. In case the patches repo only has paths.default configured but the outer repo has paths.default-push then the inherited default-push will win. Very confusing. Inheriting the default paths is however wrong in all sane cases, so now we explicitly remove them.

test-subrepo-paths: use printf instead of echo Different shells have different opinions on how to backslashes must be escaped for echo, but printf is consistent across zsh, dash, bash, tcsh, and csh.

parendelta: fix computation of base rev (fixes issue2337) Refactor revlog._addrevision() and put the correct base rev in the parent-delta case: base(rev) should always be equal to the first full snapshot that is needed by the delta chain, in both parent-delta and tip-delta case. Before this fix, the base rev was in most case wrong (and in the case where p1 == nullid, this triggered the bug from issue2337). This means that repositories converted to parent-delta earlier are corrupted and needs to be reconverted.

revlog._addrevision(): make the parent of the cached delta explicit

subrepos: handle backslashes in subpaths

help: document stringify templatefilter

test-subrepo-paths: moved comment lines to where they belong

merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: fix typo in commit help text spotted by Fred Maranhão

i18n: merge with stable

i18n-pt_BR: synchronized with 2da0cf99b642

i18n-pt_BR: fix typo

i18n-da: synchronized with 7fa36341e7a0

log: fix the bug 'hg log --stat -p == hg log --stat' Before: hg log --stat -p -r tip # only show stat After: hg log --stat -p -r tip # show stat _and_ diff

hgfixes: added a fixer to convert changes in the email package This patch adds a fixer that accounts for changes in python packages, as the framework provided by lib2to3 is only able to track changes in module names. This fixer (hopefully) can fix any change in one-level hierarchies. To exemplify, this fixer can successfully change an import from "email.MIMEMultipart" to "email.mime.multipart".

contrib/setup3k.py: added script to build hg with py3k This patch implements a script that inherits most of its functionality from hg's setup.py and adds support to calling 2to3 during invocation with python3. The motivation of having this script around is twofold: 1) It enables py3k crazies to test mercurial in py3k and, hopefully, patch it more easily, so it can improve the py3k support to eventually run there. 2) Being separated from the main setup.py eliminates the need to make hg's setup.py even more cluttered, and enables "independent" development until the port is done. Some considerations about the structure of this patch: Mercurial already overrides the behavior of build_py, this patch tweaks it a bit more to add support to call 2to3 with a custom fixer* location for Mercurial. There is also a need of having the core C modules built *before* the translation process starts, otherwise 2to3 will think those are global modules. * A fixer is a python module that transforms python 2.x code in python 3.x code.

mq: save qrefresh message for easy recovery in case it fails (issue2062) Currently, if you start editing a commit message from qrefresh -e and, for any reason: forget you were editing it, leave the editor open and start qpopping and qpushing, when you decide to save your commit message, it is going to fail. This patch copies the commit behavior of saving the message contents in $HGROOT/.hg/last-message.txt before continuing.

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.

ui: differentiate empty configlist from None

revset: predicate to avoid lookup errors A query like head() and (descendants("bad") and not descendants("fix")) (testing if repo heads are affected by a bug) will abort with a RepoLookupError if either badrev or fixrev aren't found inside the repository, which is not very informative. The new predicate returns an empty set for lookup errors, so head() and (descendants(present("bad")) and not descendants(present("fix"))) will behave as wanted even if those revisions are not found.

inotify: show the exact command used to start the server

demandimport: store level argument on _demandmod instances The 'level' argument to __import__ was added in Python 2.6, and is specified for either relative or absolute imports. The fix introduced in e160f2312815 allowed such imports to proceed without failure, but effectively disabled demandimport for them. This is particularly unfortunate in Python 3.x, where *all* imports are either relative or absolute. The solution introduced here is to store the level argument on the demandimport instance, and propagate it to _origimport() when its value isn't None. Please note that this patch hasn't been tested in Python 3.x, and thus may not be complete. I'm worried about how sub-imports are handled; I don't know what they are, or whether the level argument should be modified for them. I've added 'TODO' notes to these cases; hopefully, someone more knowledgable of these issues will deal with them.

revert: use opts.get If you want to programatically perform a revert right now you need to include a date=False parameter due to the use of opt["date"] instead of opt.get("date").

tests: unify test-copy2

mq/qqueue: enable renaming of active queue

mq/qqueue: split _setactive Prepare _setactive to be called without checking for applied patches.

merge with stable

templates: add filenolink to raw style (issue2332)

revlog: optimize deltachain

manifest: correct readdelta() according to parentdeltas

contrib: simple extension to practically convert a repo from tip delta to parentdelta

localrepo: add parentdelta to requires only if enabled in config file

revlog: append delta against p1

revlog: teach revlog to construct a revision from parentdeltas

revlog: deltachain() returns chain of revs need to construct a revision

revlog: parentdelta flags for revlog index

glossary: fixed typo

Merge with stable

tests: unify test-clone-r

tests: unify test-debugcomplete

tests: unify tests-debugindexdot

tests: unify test-debugbuilddag

tests: unify test-diffdir

tests: unify test-children

tests: unify test-revlog-packentry

tests: unify test-revlog-group-emptyiter

tests: unify test-install

tests: unify test-subrepo-svn

tests: unify test-subrepo-relative-path

tests: unify test-subrepo-paths

tests: unify test-subrepo-deep-nested-change

tests: unify test-subrepo

glossary: add entry for "Branch, inactive"

tests: unify test-patchbomb

Merge with mpm

tests: unify test-mq-symlinks

tests: use regular expressions instead of helpers

tests: unify test-mq-strip

tests: drop big sed from test-keyword.t

tests: unify test-keyword

test-walk: enable absolute path tests

tests: unify test-grep

cmdutil: code simplification

tests: unify test-log

log: do not --follow file that is deleted and recreated later (issue732) == What == issue732 is only one example of a buggy behaviour, but there are in fact many intricated cases. For example: ( "o" contains an alive version of the tracked file, "x" does not) tip - o - o - x - o - o - x ... \ o - o - o - o - x ... \ / o - o This repository contains at least two instances of the tracked file, but when calling "hg log -f file" only the latest one (the one alive in tip) matters to us. == How == We must extract from the filelog the history of the file instance we're interested in and discard changes related to other instances of that file. We see that we're only interested in ancestors(node), and that all other nodes in the filelog should not be considered.

tests: unify test-mq-safety

tests: unify test-mq-caches

tests: unify test-mq-guards

tests: unify test-mq-eol

tests: unify test-mq

Merge with stable

encoding: improve handling of buggy getpreferredencoding() on Mac OS X Prior to version 2.7, calling locale.getpreferredencoding() would always return 'mac-roman' on Mac OS X. Previously, this was handled by a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older have a bug where isspace() would incorrectly report True for 0x85 and 0xa0 after such a call. In order to fix this, we replace the previous _encodingfixup mapping to an _encodingfixers mapping. Rather than mapping encodings to their replacement, it maps them to a function returning the replacement. This allows us to provide an simplified implementation of getpreferredencoding() which extracts the expected encoding and restores the locale. This fix is based on a patch originally submitted by Martijn Pieters as well as feedback from Brodie Rao.

templatefilters: unnest uescape()

templatefilters: use \uxxxx style escape for JSON string It's embeddable in plain javascript, and also conforms to JSON standard.

test-notify: make it pass on Mac OS X (again) Changeset 25e74cd3f023 (from 2008) introduced a hack to handle the very long values of $TMPDIR typically seen on Mac OS X. This hack expected continuation lines to begin with a tab. However, as a result of a change in Python 2.7, changeset 594b98846ce1 made it so continuation lines began with a tab. Since then, `test-notify' has been broken on Mac OS X. Merely replacing the tab in the regular expression with a space will not work: not only do tab continuations still occur in the message, but other lines -- in the body of the message -- also start with a space. Luckily, all broken up lines appear to end with either a colon or an n, so we can match those, and reinsert them in the replacement.

tests: combine test-dirstate-future.t into test-dirstate.t

tests: unify test-dirstatedirs

Merge with stable

dagparser: transplant part of 4e804302d30c

check-code: catch "echo -n" in tests

test-init: replace 'echo -n' with 'printf' The '-n' argument to echo is a non-standard extension that isn't supported on Mac OS X 10.6.

revset: fix outgoing argument handling

debugbuilddag: escape backslash properly in help string

url.py: removed 'file' inheritance in the httpsendfile class Since py3k doesn't have a "file" builtin and, consequently, doesn't support inheriting from it, this patch refactors the httpsendfile class to wrap the objects returned by the builtin "open" function while adding the necessary methods (__len__ for constructing the Content-Length header and read, write, close and seek for the file-like interface).

fix undefined variables, spotted by pylint

py3kcompat: added fake ord implementation for py3k In py3k, a bytes object __getitem__ will return an int instead of a one-character bytes object. This has negative consequences when we want to ord(), like in the following example: >>> b'foo'[0] 102 >>> ord(b'foo'[0]) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: ord() expected string of length 1, but int found This patch overrides the default ord() implementation to just return an int that's what is passed as an argument for ord(). Making the above call succeed: >>> ord(b'foo'[0]) 102

commit: explicitly document the existence of "last-message.txt"

Merge with stable

tests: unify test-changelog-exec

tests: unify test-cat

tests: unify test-bundle-vs-outgoing

tests: unify test-bundle-type

tests: unify test-bundle-r

tests: unify test-bundle

tests: unify test-branch-option

tests: unify test-branches

tests: unify test-dumprevlog

tests: unify test-dirstate-future

tests: unify test-fncache

tests: unify test-bookmarks-strip

tests: unify test-bookmarks-rebase

tests: unify test-bookmarks-current

tests: unify test-bookmarks

tests: unify test-bisect2

tests: unify test-bad-pull

tests: unify test-bad-extension

tests: unify test-backwards-remove

tests: unify test-backout

tests: unify test-audit-path

tests: unify test-archive-symlinks

tests: unify test-archive

tests: unify test-annotate