commands: correct example in add help text

minirst: support line blocks

commands: add verbose example to help text for add

commands: support verbose help

minirst: report pruned container types

minirst: support containers Text can be grouped into generic containers in reStructuredText: .. container:: foo This is text inside a "foo" container. .. container:: bar This is nested inside two containers. The minirst parser now recognizes these containers. The containers are either pruned completely from the output (included all nested blocks) or they are simply un-indented. So if 'foo' and 'bar' containers are kept, the above example will result in: This is text inside a "foo" container. This is nested inside two containers. If only 'foo' containers are kept, we get: This is text inside a "foo" container. No output is made if only 'bar' containers are kept. This feature will come in handy for implementing different levels of help output (e.g., verbose and debug level help texts).

test-mq-qclone-http: hide port number

progress: only reset state if finishing progress for the current topic This prevents some visual glitches when doing a clone --pull locally.

shrink: use progress API

progress: correctly handle empty progress topic

util: add any() and all() functions for Python 2.4 compatibility This patch adds these two very useful functions to the mercurial.util module, because they are not present in Python 2.4.

merge with mpm

rebase: split line longer than 80 chars

progress: add progress calls to changeset discovery

Progress bar extension

verify: call ui.progress()

localrepo: provide indeterminate progress information while bundling

update: make calls to ui.progress()

localrepo: show indeterminate progress for incoming data This has some quirks, like showing progress bars for importing bundles, including during rebase.

Merge with crew-stable

convert: differentiate between IOError and OSError on commitctx() The IOError exception is overloaded to mean 'this file was deleted in the current commit'. Separate the code that handles IOError and file deletion from general OSError exceptions. The latter are real errors, but IOError is not always a throwable error. This solves the accidental marking of files as 'deleted' in commits that try to write for example in .hg/store/data revlogs that the current user has no permission to modify (a normal OSError that should abort the current commit). Changed by pmezard: use getattr() to be on the safe side.

test-mq-qclone: test --mq option

merge with crew

ui.progress: clarify termination requirement

relink: properly use the progress API

test-subrepo-svn: handle svn output changes gracefully

util: fix trailing whitespace found by check-code

ui: look before you leap on sys.stderr.closed (and look nicer) f83291e5643e introduced a fix if sys.stdout.closed does not exist. This change uses a getattr with default instead of hasattr (which just calls getattr) and accessing the attribute. Additionally it applies the same fix for sys.stderr.closed as this is not available in the bpython shell (reported by Roger Gammans).

Merge with stable

hgrc: update docs for the server section

localrepo: add optional validation (defaults to off) for incoming changes This verifies that all manifests are present for incoming changes, and all files for those manifests are also present. This is a simple first-pass, and could be better, but seems like a valuable thing to have, as I've seen pushes in the past that propagated revlog corruption.

branch: avoid using reserved tag names Reported as Debian bug #552423.

doc: add missing documentation for http_proxy.always

url: proxy handling, simplify and correctly deal with IPv6 Thanks to Henrik for testing.

streaming: actually change default

fix up a bunch of check-code warnings

check-code: import some pylint checks

ssl: fix compatibility with pre-2.6 Python

mq: remove unused import

url: SSL server certificate verification using web.cacerts file (issue1174)

url: httplib.HTTPSConnection already handles IPv6 and port parsing fine

mq: incorporate mq repo config when using --mq For example, incoming should use the paths defined in .hg/patches/hgrc instead of .hg/hgrc.

run-tests.py: skipped tests shouldn't change working directory

whitespace cleanup

revlog.size: remove alternate implementation (revlogv0 specific) it's only useful for revlogv0 anyway, revlogNG has the uncompressed size in the index.

pylintrc: string isn't deprecated, only some of its methods

mq: make init -Q do what qinit -c did

mq: add -Q option to all commands not in norepo

setup.py: fixing version info for Windows hg.exe (py2exe) Fixes warning: py2exe: Version Info will not be included: could not parse version number ... which was seen when doing nightly builds. hg.exe files of nightly builds did not have any version info resoure, which may cause problems with installers. Also setting a copyright string for the version resource (was missing).

test-branch-option: make it executable

tests: don't just silently strip port numbers

mq: add parent node IDs to MQ patches on qrefresh/qnew The goal of this patch is to add the IDs of the parents of applied MQ patches into the patch file headers whenever qnew or qrefresh are run. This will serve as a reminder of when the patches last applied cleanly and will let us do more intelligent things in the future, such as: * Resolve conflicts found when qpushing to a new location by merging instead of simply showing rejects. * Display better diffs of versioned MQ patches because we can tell how the patched files have changed in the meantime. Here are the new rules this patch introduces. They are checked in this order: * If a patch currently has old, plain-style patch headers ("From:" and "Date:") do not change the style or add any new headers. * If the 'mq.plain' configuration setting is true, only plain-style headers will be used for all MQ patches. * qnew will initialize new patches with HG-style headers and fill in the "# Parent" header with the appropriate parent node. * qrefresh will refresh the "# Parent" header with the current parent of the current patch.

prepush: add more precise error messages Part of the patch is from timeless@mozdev.org - indicate the branch name where there are multiple heads - give better advice when hitting a possible race, where new heads are added between discovery and the call to branchmap(). In that case, asking the user to merge isn't helpful, since only remote has the changes.

revlog: don't silently discard revlog flags on revlogv0

fix coding style (reported by pylint)

add pylintrc with some mercurial specific configuration

localrepo: cleanup branch tip computation

hgrc.5: Fix a typo

summary: various fixes, add a test fix breakage from recent parseurl changes fix reporting of resolved fix reporting of update in certain cases

fix remaining hg.parseurl uses

win32: allow hgrc.d on Windows

zeroconf: use DNS length field to safely skip unknown record types

zeroconf: better fix for readName error Stop parsing when an unknown type is seen, since it is impossible to resynchronize on the stream.

zeroconf: try utf-16 decoding if utf-8 fails

import: import each patch in a file or stream as a separate change Supports hg export <revrange>, mail messages, and mailboxes. Does not support multiple patches in a single MIME attachment. Closes issue167.

ui: look before you leap on sys.stdout.closed

mq: fix deprecation mention, line length

merge with mpm

addbranchrevs: fallback for older servers

add -b/--branch option to clone, bundle, incoming, outgoing, pull, push

subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

streamclone: allow uncompressed clones by default

help: Improved body text

commands: Try to improve help options text for basic commands Mostly rewrite -r text

check-code.py: make help strings consistent

check-code.py: escape backslash

qnew: ignore force option This makes the default behavior the same as qnew --force, and deprecates the force option.

strip apostrophes from an error messages

mq: fix typo, thanks pmezard

commands: annotate follows by default, separate -f/--file option

Merge with crew-stable

test-mq-qrefresh: test qrefresh when tip != qtip

mq: remove qrefresh slow path (issue2025) The slow path/fast path distinction has existed since mq was added to Mercurial in 2006. The slow path was used whenever the refreshed revision wasn't the tip

interpret repo#name url syntax as branch instead of revision Previously, the name part of an repo#name url was interpreted as a revision, similar to using the --rev option. Now it is instead looked up as a branch first, and if that succeeds all the heads of the branch will be processed instead of just its tip-most head. If the branch lookup fails, it will be assumed to be an revision as before (e.g. for tags).

dispatch: provide help for disabled extensions and commands Before a command is declared unknown, each extension in hgext is searched, starting with hgext.<cmdname>. If there's a matching command, a help message suggests the appropriate extension and how to enable it. Every extension could potentially be imported, but for cases like rebase, relink, etc. only one extension is imported. For the case of "hg help disabledext", if the extension is in hgext, the extension description is read and a similar help suggestion is printed. No extension import occurs.

extensions: refactor disabled()

mq: don't warn on qpush against a branch head

mq: deprecate qinit and qcommit

mq: deprecate qsave, qrestore and related options

mq: add --mq option to some commands This causes them to operate on the queue repository as qcommit does, and is nicer than hg -R $(hg root)

pull: with -u and -r, update to the first revision given This makes pull consistent with clone. The actual change is in mercurial.hg.parseurl, changing its checkout result, which is only used for pull.

localrepo: inline single-use nested function

localrepo: unify changegroup and changegroupsubset code paths a bit

merge: add hints about the use of 'hg heads' to find the rev to merge

prepush: warn about every new outgoing named branch, not just the first

prepush: rename variables, refactor

rebase: add --detach option to detach intermediate revisions (issue1950) When rebasing an intermediate revision, rebase keeps a parent relationship with the original parent. This option forces the removal of this relationship. In more depth, it 'fakes' null merges between the target revision and the ancestors of source, dropping every change from the ancestors. The result is that every change in source and its descendants will be rebased, ignoring the changes in its ancestors.

rebase: refactoring Separate rebase-specific functions, in order to provide a better base to extend rebase's capabilities. Note that this will be useful especially to share functions with 'adapt'.

commands: do all branch heads by default, demote topological to -t/--topo

commands: actually implement --closed for topological heads

commands: externalize branchheads so we can do it for all branches at once

commands: move inactive/closed out so they can have more effect

commands: don't do too much work for error messages

commands: allow --closed even for topological heads displays But it actually only starts working later on.

util: make spawndetached() handle subprocess early terminations The file-based synchronization introduced by e22695b4472f hangs when the child process fails before terminating the handshake, which the previous pipe-based version handled correctly. To fix this, the parent polling loop was fixed to detect premature terminations of the child process.

zeroconf: do not try to encode encoded strings (issue1942)

zeroconf: override default destination folder on clone

merge with main

merge with main

fix spaces/identation issues

Merge with crew

Merge with crew

run-tests: kill daemons on ^C with -j. This is not perfect, but the problem is fundamentally racy.

commands: fix more changeset header information in 'hg help export'

commands: fix the list of changeset header information in 'hg help export'

graphlog: remove unused import

keyword: fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.

commands: always order heads recent to oldest

commands: fix up stupidly untested heads simplification

revlog: fix up previously stupid API change

commands: simplify heads a little bit before I start hacking it up

localrepo: add a quick docstring for localrepo.branchmap()

commands: deprecate the heads -a option Hopefully we can remove it entirely in two releases or so.

revlog: add a fast path for checking ancestry

subrepo: correct copyright

record: function variable naming & signature cleanup. No functionality change. All tests pass.

add options dict to localrepo.store.opener and use it for defversion

merge with main

localrepo: minor formatting - remove double space

coverage.py: fixed syntax error

merge with stable

zeroconf: gethostbyaddr may also fail with socket.herror

Merge with stable

commands: label from user is in local encoding repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8 before checking for a naming conflict. Keep the original label for ui.status()

merge with main

copies: check if revisions are related (bug found with pylint)

Merge with stable

Added signature for changeset 4aa619c4c2c0

Added tag 1.4.3 for changeset 4aa619c4c2c0

Merge with i18n

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with b08ffd27dfc8

Merge with stable.

i18n: fix typo in German translation

i18n-ja: synchronized with e7727a545c48

Merge with stable

templates: rename `Last change' column in hgwebdir repository list. This patch changes column headers in the templates that previously said `Last change' to `Last modified'. Neither code nor functionality are changed other than that. For some time now, I have been annoyed by the fact the `Last change' column didn't list the age of the youngest changeset in the repository, or at least tip. It just occurred to me that this is because the wording is slightly misleading; what the column in fact lists is when the repository was last *modified*, that is, when changesets was last added or removed from it. The word `change' can be understood as referring to the changeset itself. Using `changed' would be ever so slightly less amigous. However, the standard nomenclature in this case is `modification date' and `Last modified', which is incidentally entirely unambigous. Hence, `Last modified' is the wording used.

run-tests: split tests/blacklist in tests/blacklists/* Following discussions with Gilles Morris [1], it seems that it is preferable to use several blacklist files in a blacklists/ directory. It is easier to add an unversioned file for experiments than modifying a tracked file. Also fall back to a simpler syntax, giving up ConfigParser, now that section names are not needed anymore. And allow --blacklist parameter to be a complete path, instead of only one of the filenames contained in tests/blacklists/ [1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html

subrepo: fix errors reported by pylint

copies: revert d1cd09bb4d18 The behavior of rebase both before and after the fix was actually incorrect, and this change regressed other parts of copy behavior.

Merge with i18n

Merge with stable

config: handle short continuations (issue1999) Thanks to Greg Ward for spotting and testing

copies: fix issue1994 Unscramble divergence test

i18n-sv: Translated twelve basic commands The help text and output strings surrounding these commands are now available in glorious Swedish: outgoing, paths, recover, rename, resolve, revert, rollback, root, showconfig, tag, tags, tip This also syncs with 279c8a73fde1.

bugzilla: lowercase mysqldb var

check-code: del isn't a function

check-code: fix copyright date

test-minirst: hide trailing whitespace from check-code

zeroconf: flag third-party Zeroconf.py for ignore in check-code

check-code: add some ignore hints

check-code: check thyself

Merge with stable.

patchbomb: document [patchbomb] config section for addresses

hgrc.5: whether bcc is prompted for is up to the extension There is no code in mail.py that forbids an extension to prompt for bcc.

many, many trivial check-code fixups

Introduce check-code.py check-code is a simple regex-based framework for checking our code and tests for common style and portability errors. Currently, it knows a fair amount about our Python and C style, and a little about common shell script portability problems.

merge with stable

test-encode: Use tr chacter classes instead of character ranges Solaris ...

Merge with stable

templates: do not add "ago" twice After 1d75c683ada1, "ago" is added by the ago template filter.

Merge with stable

tests: Don't use $PWD $PWD doesn't work with solaris sh - use `pwd` instead

mq: Do not translate import message that are appended to commits. We should not translate the "imported patch" message. The translated message confuses the detection whether the user has not updated the commit message yet. We try to avoid to translate generated commit messages.

subrepo: handle svn externals and meta changes (issue1982) - Detect changes to meta on regular and external entries - Do not try to commit external entries

subrepo: svn xml output is much easier to parse That's especially true with status flags: there are different fields and values for regular changes, meta changes, externals changes and externals meta changes.

subrepo: make svn use C locale for portability My reasons to do c2e2a5e6c36b were wrong. We want to have non-localized svn output while preserving current locale for input arguments and svn internals. This is achieved by setting LC_MESSAGE=C.

Merge with stable

summary: L10N messages hide clean-ness of workdir from 'hg summary' 'hg summary' recognizes workdir as clean by searching for 'clean' is in own output text. But 'clean' is one of I18N target texts, so 'hg summary --quiet' behaves incorrectly in non-English locale.

mercurial.el: add forgotten version number The number was accidentally removed in the change from GPLv2 to GPLv2+ in 25e572394f5c.

test-subrepo-svn: remove bashism

Merge with crew-stable

test-patch-offset: Don't use unified diff Solaris diff -u likes to be "helpful" and tell that "No differences encountered"

Merge with stable

Update license to GPLv2+

copies: speed up copy detection On some large repos, copy detection could spend > 10min using fctx.ancestor() to determine if file revisions were actually related. Because ancestor must traverse history to the root to determine the GCA, it was doing a lot more work than necessary. With this replacement, same status -r a:b takes ~3 seconds.

hgweb: request: strip() form values Entering "<correct_cset_hash> " in the search form was not returning anything. This happens relatively often, due to HTML formatting: when copy/pasting a cset hash from the web, selection might contain surrounding spaces.

templatekw: fix extras, manifest and showlist args (issue1989) Removing the explicit parameters from keywords signature is easier than copying and reproducing the original argument list.

merge with i18n stable

i18n-pt_BR: synchronized with 279c8a73fde1

Merge with stable

share: be more explicit about the dangers of rollback.

mercurial.spec: Alignment with AIX spec by Jim Hague * Require Python 2.4 or later * Note that hgk uses tk - but don't require it * Remove bashism to support ksh * Install mq.el * Handle uncompressed man pages

hgweb: changenav: separate pages before and after the current position This should allow styles to customize more precisely navigation bar, for example inserting a cursor to show where we are in the navigation bar.

Work around AIX shell builtin printf not handling \NNN. On AIX, ksh builtin printf does not understand \NNN. Some tests use this to generate test data, and so fail on AIX. Rework these tests to use python to generate the correct characters. This fixes the tests on AIX and should be more generally portable.

merge with stable

subrepo: fix merging of already merged subrepos (issue1986) This fixes a bug seen when merging a main repo which contains a subrepo when both repos have been merged before. Each repo (main and sub) has two branches, both of which have been merged before. In a subrepo, if the revision to merge to is an ancestor of the current rev, then the merge should be a noop. Test provided by Steve Losh.

Merge with crew-stab le

cmdutil: expand style paths (issue1948) Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>

hgweb: add a test for search logs

hgweb: add less/more links for search logs (issue1972)

hgweb: add less/more links to shortlog/filelog nav

hgweb: make graph page size equal to shortlog

merge with stable

ui: just return it if it's already a bool

demandimport: ignore _winreg (used in python-2.7 mimetypes)

shrink-revlog: add --dry-run option

cmdutil: hide child window created by win32 spawndetached() Hiding the child process window is not strictly necessary but it avoids opening an empty shell window when running hg serve as well as a task in the task bar. The window is hidden after the process is already started causing a single flicker.

Find right hg command for detached process On Windows, Mercurial can be run from the python script of from a frozen executable. In the first case, we have to call the python interpreter since the script is not executable. Frozen executable can be called directly. Fix 3/3 for issue421

cmdutil: replace unix pipe handshake with file lock The pipe handshake cannot be implemented with Windows detached process, which disables handle inheritance. Fix 2/3 for issue421

serve: add and use portable spawnvp replacement There is no standard python command to really detach a process under Windows. Instead we use the low level API wrapped by subprocess module with all necessary options to avoid any kind of context inheritance. Unfortunately, this version still opens a new window for the child process. The following have been tried: - os.spawnv(os.P_NOWAIT): works but the child process is killed when parent console terminates. - os.spawnv(os.P_DETACH): works on python25, hang on python26 when writing to the hgweb output socket. - subprocess.CreateProcess() hack without shell mode: similar to os.spawnv(os.P_DETACH). Fix 1/3 for issue421

shrink-revlog: help/doc tweaks - make it look right in 'hg help extensions' - clarify --revlog option - add a main program to tell users this is no longer a standalone script

Add shrink-revlog.py to win32 installer

shrink-revlog: make it work on windows (issue1976)

merge main with stable

merge crew together

merge stable together

merge with stable

shrink-revlog: avoid cryptic error when used as an extension When shrink-revlog is used as an extension, it would produce an error when switching back to stable because the script will try to execute itself.

transaction: initialize self.journal to None after deletion This avoid a warning when having an empty transaction, where hg would try to delete the journal twice.

subrepo: fix typo in help text

Merge with stable

relink: ensure consistent candidate order

commands: fix typo in help text

color: colorize output of hg resolve -l

color: improve coding style

Merge with crew-stable

ui: display progress with decimal notation

win32: close file when leaving _getfileinfo()

Add support for relinking on Windows. Test and minor code change by Patrick Mézard <pmezard@gmail.com>

Add test for relink extension

contrib: small documentation fixes in shrink-revlog.py

contrib: turn shrink-revlog.py into an extension

contrib: fix error handling in shrink-revlog.py to be more hg-like

contrib: use ui to write in shrink-revlog.py

Merge with stable.

Update test and man page for multiple matching encode/decode filters

commands: fix help string for pull -u and unbundle -u. They update to new branch head, not new tip -- same as 'hg update'.

Update copyright year to 2010

httprepo: always store the response url (issue1968) Fixes a regression caused by 54b518fc6671

Merge with stable

commands: update copyright year to 2010

test-convert-svn-branches: filter unwanted output Windows cmd.exe emits a different message than sh: """ foobar is not recognized as an internal or external command, operable program or batch file. """ Filter it.

Merge with crew-stable

patch: explicitely close input patch files when leaving If applydiff() raises an exception, the opened patch file is kept alive in the exception context. If it is a temporary file (for instance supplied by import command with stdin input), Windows cannot clean it up.

Merge with crew-stable

hgweb: improve IIS PATH_INFO fix ee8af8a4d905 (issue1580) Copy PHP IIS detection.

Minor svn conversion tests cleanup

subrepo: force en_US.UTF-8 locale when calling svn Parser only knows about en_US output. Forcing the encoding to UTF-8 might not be the best thing to do since the caller may receive some of the subversion output, but at least it should prevent conversion errors from svn client.

test-subrepo-svn: normalize OS specific path separator

subrepo: normalize svn output line-endings

test-subrepo-svn: avoid pushd/popd

Merge with stable

Added signature for changeset 296a0b14a686

Added tag 1.4.2 for changeset 296a0b14a686

Merge with crew

mq: qdiff with the same diff options than qrefresh (issue1350) Specifically, if current patch is a git patch and mq.git=keep, diff in git mode.

mq: upgrade to git patch when necessary (issue767)

patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

Merge with crew-stable

Merge with stable

mq: preserve --git flag when folding patches Without this, folding a git patch into a regular one downgrades the resulting patch to a regular patch.

mq: preserve --git flag when merging patches Without this, merging a patch queue without diff.git=1 downgrades all git patches to regular patches, losing data in the process.

mq: stop caching and sharing diff options Several mq commands mutate the shared options which causes hard to track bugs when multiple calls are combined.

subrepo: mark string for translation and fix case

Add RelaxNG schema to win32 installer

Merge with mpm

Merge with crew-stable

copies: don't report copies with unrelated branch

subrepo: Subversion support

subrepo: add table-based dispatch for subrepo types

dirstate: don't check state of subrepo directories

subrepo: load from a context where the subrepo exists

subrepo: fix includes support in .hgsub

Merge with stable

i18n: update po files for 703db37d186b and 0ddbc0299742

Merge with i18n

Merge with stable

Merge with i18n.

Merge with i18n-stable

i18n: merge with stable

i18n-da: import strings from default branch

i18n-sv: synchronized with 37679dbf2ee3

merge with i18n stable

i18n-it: removed extraneous '\r' from message

i18n-pt_BR: synchronized with 37679dbf2ee3

Added RelaxNG schema for hg log XML output format

Bugfix and test for hg log XML output

Added output of "extras" to hg log XML output

Merge with stable

run-tests.py: clears http_proxy for all tests

windows: expand environment vars in find_exe This allows us to use ${ProgramFiles} in our [merge-tools] sections so we can provide locale safe program paths.

Merge with stable

run-tests.py: clears http_proxy for all tests

Added XML output for hg log The XML format is based on the one used by Subversion. Currently the closing "</log>" tag is not written, since cmdutil.py does not support the "footer" template variable.

Added support for templatevar "footer" to cmdutil.py

patch: make git diffline generation more explicit

mq: untangle git patch detection

test-mq: better tests delimitation

Merge with crew-stable

test-bisect: test handling of invalid commands without relying on sh

diffhelpers: fix variable declaration for MSVC (not C99)

dirstate: improve docstring formatting Triple-quoted strings are easier to spot than single-quoted strings.

test-help: improve test coverage Adds a test for displaying a help topic. Extends test coverage of commands.help_ by 5 lines.

test-help: improve test coverage Adds a test for displaying a command list with a command with no help text. Extends test coverage of commands.help_ by 1 line.

test-help: improve test coverage Adds a test that extension commands are omitted from the default command list. Extends test coverage of commands.help_ by 1 line.

test-help: improve test coverage Adds a test for commands without help text. Extends test coverage of commands.help_ by 1 line.

test-help: improve test coverage Adds a test for help on a command with no options. Extends test coverage of commands.help_ by 2 lines.

test-help: improve test coverage Adds a test for handling ambiguous command help Extends test coverage of commands.help_ by 4 lines.

merge with stable

monoblue: fix title for branches page

Merge with crew-stable

patch: better handling of sequence of offset patch hunks (issue1941) The built-in patch implementation applied the hunks to the wrong lines of the file if the file in the repo has been modified to skew the patch line numbers and the file contains repetitive sequences of lines.

Makefile: added instructions on how to override PREFIX

Merge with stable

win32text: do not mention hgext in warning

patch: drop unused hunk.newctrl()

test-import-eol: improve binary hunks test

diffhelpers: handle CRLF in hunk last line without EOL Note that diff generation code always ends last lines without newline with a LF, so this is a tolerance.

patch: drop eol normalization fast-path for 'lf' and 'crlf' With eolmode set to 'lf' or 'crlf' we avoided the hunk duplication and normalization by reading the input patch in text mode. Dropping this optimization simplifies code expectations for a small overhead. The change in test-mq-eol comes from a tolerance to CRLF instead of LF for last lines without newlines being broken by this revision. This tolerance was only partially supported and will be added again in a better way.

patch: fix eolmode=auto with new files If target file does not exist or has no eol, current code was normalizing eols to LF. Preserve patch file eols instead.

Merge with stable

tests highlight, keyword: load extensions with "ext ="

setup.py: keep Python 2.3 compatibility Though we only support Python 2.4 or greater, we should keep setup.py compatible with earlier versions on the syntactic level. Otherwise people will simply get a SyntaxError when trying to install Mercurial with an old version of Python. With this change, the setup.py file can be imported with Python 2.3 and we then issue a friendly error message when we detect that Python is too old.

Merge with stable

extensions help: make disabling example analogous to enabling example The example for enabling an extension in the module search path is: foo = foo can only be disabled by: foo = ! and not by: hgext.foo = ! As the examples now omit "hgext." the example hgext.bar = ! is misleading.

test-help: improve test coverage Adds a test for using the help option with the version option. Extends test coverage of commands.help_ by another 2 lines.

setup: ignore 'not importing' warnings during version detection Python will issue an ImportWarning when seeing 'import locale' if there is a locale/ directory present without a __init__.py file. The warning is silent by default, but it somehow shows up anyway on Windows when setup.py executed hg. The warning causes runcmd to panic since it sees output on stderr. This patch ignores warnings on stderr about not importing a package.

tests: load with "ext =" instead of "hgext.ext ="

Merge with stable

keyword: go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.

keyword: do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.

merge with default

mq: qnew -f should reject merge working directories

Merge with stable

hgext: enable extensions without "hgext." prefix in help texts

cmdutil: replace sys.maxint with None as default value in loglimit Semantically, it is better to use None over any other value when there is "no value". Using maxint in this context is quite hackish, and is not forward compatible.

test-help: improve test coverage Adds a test for displaying the short list of commands with the verbose option i.e. 'hg -v help shortlist'. Extends test coverage of commands.help_ by 2 lines.

bookmarks: move parse() and current() into property definitions

bookmarks: refactor code responsible for updates of bookmarks introduce _bookmarksupdate for common parts from commitctx and addchangegroup

bookmarks: repo._bookmarkcurrent should be a propertycache

bookmarks: write() can simply access repo._bookmarks

bookmarks: turn repo._bookmarks into a propertycache

Merge with stable

hook: fix bug (reuse of variable) introduced in 872d49dd577a For binary installs, the 'name' argument would be reused as a local variable, destroying its original value. The patch fixes that, and also avoids copying sys.path when it's not necessary.

patch: implement patch.eol=auto mode EOLs in patched files are restored to their original value after patching. We use the first EOL found in the file, files with inconsistent EOLs will thus be normalized during this process.

patch: propagate eolmode down to patchfile The old code mapped the value of eolmode ('strict', 'crlf' or 'lf') to eol (None, '\r\n' or '\n') at the entry point in internalpatch. The value of eol was then used directly as the desired EOL in patchfile. We now delay the mapping and let patchfile do it instead. This allows for more complicated behavior where it does not make sense to map eolmode directly to the target EOLs.

Merge with stable

share: use defaultdest to compute unspecified destination This harmonizes with clone, and avoids creating a .hg in the current directory if the source ends with a /

Merge with stable

glog: fix "incompatible option" error message. Options like 'only_branch' should be presented to the user as '--only-branch'.

Merge with crew

convert: implement two hooks in builtin cvsps

Merge with crew

Merge with stable

doc/Makefile: Fix rst2html detection Displaying the output from the failing call to "which" didn't prevent make from doing stupid things later. We now only search for "rst2html" and fallback to "rst2html.py". If neither name is found, make will eventually abort when we try to use $(RST2HTML).

inotify: completely ignore events on the repository root They can only be events on the top directory object. Those events are meaningless for us: permission changes, repository-wide moves... And they break the assertion that all events happen in repo/*. Just ignore them. Fixes one of the failures of run-test.py --inotify test-permissions

inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate stat() is not reliable when several events happen quickly. Which means that if two hg actions occur in the same second, stat() result will not reflect the second change. And only _one_ invalidate() call was done. Also ignore the events that occur when wlock is held, since wlock release will trigger a full rescan anyway. Fixes 17 run-tests.py --inotify tests.

inotify: follow new files if they are regular or a symlink. Fixes run-tests.py --inotify symlink-basic

run-tests.py: Show paths to failing tests, .err and .out I think this is very convenient when investigating and fixing test failures, but perhaps it must be tweaked further to show paths if and only if it is appropriate.

Merge with stable

convert: make hg sink cleanup safer

Merge with stable

graphlog: fix output when both a limit and a path are provided Limit was interpreted as absolute, from the topmost revision, without counting the number of revisions matching a given file. Which caused "glog -lN file" to show sometimes less than N csets if the file was not modified in all of the N previous csets. glog will now match the behavior of log.

mercurial.iss: update locale location

test-share: Solaris sed can't handle never-ending lines

test-rollback: Ignore hook exit code Failing hooks returned 255 on Solaris

Merge with crew-stable

test-hook: Don't use extended regular expressions with grep Using egrep fixes failure on Solaris

hgweb: Make get_mtime use repository to find store path. It was calculating it directly, which is redundant and caused it to break with shared repositories.

make ui.interactive() return false in case stdin lacks isatty

Merge with stable

Merge with crew

Merge -stable heads

Makefile: update "make clean" target after f91e5630ce7e

Merge with crew-stable

convert/svn: better handling of hg recursive call failure

schemes: url parts are counted from 1

Merge with -stable

subrepo: add default path to new clones

win32mbcs: fix typos and reST syntax

help/templates: use hanging indent for field list Now that the field list indentation is computed automatically, we no longer need to align all fields the same. Using a simple hanging indent makes it easy to edit the text in an editor like Emacs, which will automatically recognized the hang and keep it. The fields are still output with no blank lines between them.

minirst: improve layout of field lists Before, we used the padding following the key to compute where to wrap the text. Long keys would thus give a big indentation. It also required careful alignment of the source text, making it cumbersome to items to the list. We now compute the maximum key length and use that for all items in the list. We also put a cap on the indentation: keys longer than 10 characters are put on their own line. This is similar to how rst2html handles large keys: it uses 14 as the cutoff point, but I felt that 10 was better for monospaced text in the console.

minirst: don't test regexps twice We know the regexps match since splitparagraphs used them too.

minirst: run inlineliterals too in debug mode

test-share: handle sed/GNU-sed discrepancies

Make {file_copies} usable as a --template key Before this, to display file copies in templates, you had to write something like {file_copies%filecopy}. For some reason, the {file_copy} subtemplate was used by default but not defined by default in changeset_templater, while styles were already using it. Here we define {file_copy} in changeset_templater, and change the templater to handle formatting strings like {file_copies%filecopy} with already expanded keys (in this case {file_copies}), for backward compatibility.

templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.

test-command-template: test 'file_copies' keyword

cmdutil: extract file copies closure into templatekw

cmdutil: extract latest tags closures in templatekw

cmdutil: extract file changes closures into templatekw

cmdutil: extract repo dependent closures in templatekw

cmdutil: extract ctx dependent closures into templatekw

cmdutil: replace showlist() closure with a function

Merge with crew-stable

convert/svn: make sink recover gracefully from empty changeset Otherwise when processing a changeset that in fact changes no files (perhaps due to bug in import from CVS) can get something like: unexpected svn output: abort: unable to cope with svn output Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>

win32mbcs: Add configuration to specify path encoding Add win32mbcs.encoding configuration option to specify the encoding to use instead of encoding.encoding. This option is useful for the users who want to write UTF-8 log message on non UTF-8 path encoding environment.

Merge with stable

mq: qpop: remove added files before re-adding removed files We need to do this to avoid file/directories conflicts. This causes patches removing a committed file and replacing it with a directory to be "unpoppable".

revlog: rewrite several method docstrings - methods: findmissing(), nodesbetween(), descendants(), ancestors() - the goal is precise, concise, accurate, grammatical, understandable, consistently formatted docstrings

color: Add support for bookmarks

color: Do not pass --color, --no-color parameters to wrapped function Passing the --color and --no-color parameter to the wrapped function can cause a invalid argument exception if the wrapped function doesn't accepts a **opts dict.

Merge with stable

test-hgrc: cleanup - don't create a repository for no reason. - empty $HGRCPATH for better isolation between tests

config: raise ConfigError on non-existing include files Before, an %include directive for a non-existing file resulted in an IOError and a traceback.

Merge with i18n

i18n-el: translate Mercurial's copyright info message

i18n-el: translate the rest of hgext/bookmarks

i18n-el: translate the help of acl.py

i18n-el: translate hgext/bugzilla.py

i18n-el: remove obsolete translations

i18n-el: translate verify

i18n-el: add missing space to "remote: "'s translation

i18n-el: resync i18n/el.po with changeset 2ba40cdaacb2

i18n-el: remove some Danish strings The original el.po file was copied from da.po and I missed a few Danish strings in the version I submitted to crew.

mercurial.iss: add tcsh completion script

run-tests: backout d7c23f4a14c7 We no longer have any data files, so this is no longer needed. Augie Fackler reported on IRC that this "hack" had never worked for him in the first place.

mercurial.iss: backout 08bbed8ac9b8 Not a complete backout, the bash_completion script is still installed.

setup: backout 68964567e406 We decided that it is better to let the distributions install these files themselves since they know where to put them.

subrepo: document necessary methods for a subrepo class

merge with the stable branch

cmdutil: copy auth section in remoteui This allows me to specify an auth section in a .hg/hgrc instead of just a global or user-level hgrc.

log --follow: use a set instead of a list benchmarked with hg log -qf on the linux kernel: before: Time: real 39.010 secs (user 38.840+0.000 sys 0.060+0.000) after: Time: real 8.560 secs (user 8.440+0.000 sys 0.080+0.000)

Merge with stable

patchbomb: fix bug introduced in 4ddfad7ebd98 and add test Thanks to Augie Fackler for reporting this.

help: don't display bogus help messages for invalid aliases

run-tests: install data files correctly In 68964567e406 we began installing some data files in PREFIX/share. When preparing to run the tests, run-tests.py uses --home="" in order to work around home being set in a ~/.pydistutils.cfg file. This somehow overwrites the --prefix option. The result was that the share/ directory was installed in the top of the Mercurial source tree.

Merge with stable

patchbomb: handle repository#rev URLs correctly

contrib: helper extension to track memory usage

export: fix tests

commands.export: accept -r option as revision specification This brings consistency with other commands option and allows specification of negative numbers (-r -2), which were recognized as options earlier.

status: add the --change option to display files changed in a revision This option is similar to the one already used for the diff command. Unfortunately, the c and C short option are already used for status, so there is no corresponding short option. However, there is no short option for --rev either, so that's consistent.

run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS Introduce a inotify.appendpid configuration possibility that appends pids to inotify.pidfile when set to True.

cmdutil: service: add appendpid parameter to append pids to pid file

changegroupsubset: readdelta() can be used if the previous rev is a parent

changegroupsubset: simplify parents pruning

shrink-revlog: improve performance: use changegroup instead of revisions Before: real 0m23.971s Now: real 0m4.229s The only case where the output would be different is if the newer hg was using a different diff algorithm than used originally.

Update win32 installer paths for bash and zsh scripts after move done in 68964567e406

rst2man: s/dont/don't/ in comment

rst2man: separate inline blocks from previous paragraphs

setup: install some useful data files. The selection is somewhat arbitrary. In the case of the Zsh completion file, it will not conflict with the builtin Zsh completions: they are in a file named `_mercurial', not `_hg'.

color: add support for churn --diffstat

Makefile: help/ was moved in f91e5630ce7e update paths to match

Update win32 installer with changes from f91e5630ce7e

doc: correct path to help files in Makefile

setup: cleanup coding style

setup: install translation files as package data Remove the `install_package_data' subclass of `install_data' and use the `package_data' functionality provided by distutils instead. As package data must be located within the package directory, the data files are now generated in the build directory. To simplify the functionality of this change, the top-level `doc' and `templates' directories have been moved into the `mercurial' package directory.

setup: don't ship i18n directory The directory was never actually used at runtime and other programs don't ship it either.

Merge with stable

handle file URIs correctly, according to RFC 2396 (issue1153) The new code aims to implement the RFC correctly for file URIs. Previously they were handled incorrectly in several ways, which could cause problem on Windows in particular.

transplant: fix small bug when a patch fails while using --filter

Merge with stable

alias: do not crash when aliased command has no usage help text

Merge with stable

revlog: add fast path to ancestor

share: add a test script.

hgk: do not ignore ---/+++ lines in diff

Merge with stable

Added signature for changeset 439d7ea6fe3a

Added tag 1.4.1 for changeset 439d7ea6fe3a

Merge with stable

share: fix interaction with clone

Merge with crew

Merge with stable

Merge with i18n

Merge with stable

i18n: hand-transplant change in 36760956f6d3

i18n-da: synchronized with af5f99d8195e

merge with i18n-stable

i18n-pt_BR: added strings from crew 5b149c88d9e8

backout experimental change from 777c1df76ef4

context: parents() already filters nullid

context: use key-sorting instead of tuples

Merge with stable

doc/Makefile: ensure C locale The man pages can actually be translated by building them in a different locale. However, the man pages contain internal links to certain sections, and when the section titles are translated, the links change too. So it is currently not recommended to build the man pages in anything by the "C" locale.

commands: mark "ssh://" as inline literals in help texts

test-rollback: fix reference to /bin/false (fails on OSX)

Merge with stable

schemes: fixed typos in module docstring

schemes extension

schemes: fixed typos in module docstring

schemes extension

Merge with crew

convert: better error on invalid repository type

cmdutil: fix missing default 'extra' template

test blacklist: add inotify-failures target

run-tests: add a "--blacklist target" option to skip predefined test lists Rely on a ConfigParser file, tests/blacklist, to define blacklist targets. This allows exposing specific test suites for testing incomplete/particular features, e.g. "run-tests.py --blacklist inotify-failures --inotify *"

run-tests: add --inotify option to test runner Activate inotify extension when running tests.

merge with stable

extdiff: respect --option in command aliases (issue949)

merge with stable

fix bug in prepush logic involving merge changesets When creating new branches and merging them into existing ones, you would sometimes be able to push some changesets (the existing branches) without using --force, even when that creates a new head on the remote. A test which triggers the error has been added.

Merge with stable

commands: add missing options in command line help

commands: mark strings for translation

keyword: clarify object of backwards compatibility

commit: write last-message.txt with no content modifications. This assumes the user will use either a sane editor (anything but Notepad) or the same editor again: even Notepad should be able to read what it previously wrote.

mail: add parseaddrlist() function for parsing many addresses at once Adds a new function addrlistencode() to mercurial.mail, like addressencode(), but accepts a list of addresses as input, and returns a list of formatted addresses. This will be used by patchbomb. The difference is that each element in the input list can contain multiple addresses (comma separated or otherwise), and are split using Python's email.Utils.getaddresses().

patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Instead of using custom code to split apart addresses, we now use mail.parseaddrlist() which always does the Right Thing as it relies on Python's email.Utils.getaddresses(). Previously, 'hg email --to=foo,bar' only respected foo and discarded bar. Also, commas in names were not allowed in hgrc or the interactive prompt; specifying '"Lastname, Firstname" <foo>' would confuse patchbomb. The testcase uses '-m tmp.mbox' because -n (like in other tests) would disable address mangling.

templates: add raw templates for tags/branches pages

extdiff: wrap long lines in docstring and comments Gettext wraps lines in the messages when it writes them to the hg.pot file and that makes long lines look odd in the resulting .po file.

Merge with stable

keyword: the CVS keyword is $RCSfile$, not $RCSFile$ http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords Fix default keyword map accordingly. Keep $RCSFile$ for Mercurial backwards compatibility.

keyword: sort demo output to ensure deterministic output

extdiff: prevent exception on double-translation The docstring is translated twice: once when used as a format string, and once on display. The second translation fails when the first translation introduces non-ASCII characters in the string. The problem is that the gettext module calls unicode(message) on the string, i.e., it decodes it to a Unicode string using the ASCII encoding (the default encoding). By translating it into a Unicode string here, the unicode() call becomes a noop.

Merge with stable again

Merge stable heads

Fix changelog test

Merge with stable

list branches in changelog template

commit: if relevant, tell user their commit message was saved. (issue1635) Specifically, if: 1) the user edited the message (it didn't come straight from -m) and 2) the commit was aborted by an exception then the saved commit message in .hg/last-message.txt could come in handy, so mention it with a ui.write(). This doesn't help users who manually rollback to amend a changeset: the fact that the message was saved to .hg/last-message.txt is invisible in that case.

commit: save commit message so it's not destroyed by rollback. (issue1635) Rationale: if a pretxncommit hook rejects this commit, the transaction is rolled back and the user's commit message is irrevocably lost. So save a copy in .hg/last-message.txt, just in case. Also handy if the user deliberately rolls back a commit in order to amend it.

inotify: create a common, OS-independent server entry point * rename server.py to linuxserver.py * create server.py: it will contain OS-independent logic for servers, and will import the right server depending on the OS * old server.server class is renamed to linuxserver.socketlistener

perf.perflog: add option to follow renames

run-tests: LANGUAGE may make tests fail

Merge with mpm

merge with crew

findrenames: improve coding-style

findrenames: speedup exact match benchmarked on crew repo with: rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done followed by: hg addremove -s 100 before: Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000) after : Time: real 6.790 secs (user 5.310+0.000 sys 1.350+0.000)

findrenames: refactor the score computation

findrenames: first loop over the removed files, it's faster Getting the file from the working dir is less expensive than getting it from the repo history, hence the speedup. benchmarked on crew repo with: rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done followed by: hg addremove -s 100 before: Time: real 68.760 secs (user 65.760+0.000 sys 2.490+0.000) after : Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)

localrepo: support 'rev in repo' syntax

zsh completion: add summary

Merge with stable

Merge with crew

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with 5d748045c2ae

Merge with crew

commands.log: getrenamed() cleanup

ancestor: improve docstring The term "least common ancestor" is highly ambiguous.

merge with stable

run-tests: always set $COLUMNS, fix running tests under emacs shell fix tests failure reported by Neal Becker.

Merge with crew-stable

Add help files to win32 installer (issue 1919)

hgweb: add support for extension-provided permission hooks This allows extensions to hook into permission checking, providing both authentication and authorization as needed. The existing authorization function has been changed to a hook, which is added by default.

Merge with i18n

i18n-da: synchronized with b5170b8b32a5

i18n-sv: translated seven commands These commands has been translated: addremove, archive, backout, config, unbundle, verify, version

i18n-sv: synchronized with b5170b8b32a5

run-tests: work around a distutils bug triggered by 0a8a43b4ca75

merge with crew-stable

Do not overwrite motd attribute of hgwebdir instances on refresh. This allows using application = hgwebdir(...) application.motd = (string or object with __str__ method) in WSGI (like it is possible in CGI). Changed web.motd in the config file is still read with this, because hgwebdir.templater.motd() does not store the config value.

Merge with stable

commands: minor refactoring Renamed local variable i to entry in helpcmd.

inotify: improve error messages * prefix messages by inotify-(client|server) * make sure that all warning and abort messages use the same format. * in the case where inotify.sock is an old broken symlink, say so and abort instead of trying to overwrite the already existing link

run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.

merge with stable

inotify: add a inotify.pidfile configuration possibility This will mainly help us in our tests to log pids of inotify servers started implicitely, to make sure that unkilled inotify daemons do not clutter the output of unrelated tests. Also desactivate the workaround introduced in 951ec6c7d703

cmdutil.service: do not _exit(0) in the parent process The fact that a parent process spawns a daemon does not necessarily means that it is the only think it has to do. This was forcing since 7c01599dd340 inotify processes launched implicitely to exit prematurely: when no inotify server was running, "hg st" for example would only launch a inotify server, _exit(0) and thus would not return file statuses. This changeset adds a test for implicitely launched inotify processes. Change to output of test-inotify-1208 is correct: it reflects the normal error message of "hg st" when not dying during "hg inserve" daemon creation.

Merge with stable

commands: improve help for "hg clone -r"

commands, dates: use real lists instead of literal blocks

commands: use field lists instead of literal blocks in docstrings The literal blocks were mis-used for alignment, but this of course changes the font of the entire block to a fixed width font in the HTML version. Using a proper list solves this.

commands: do not indent list in clone help string

run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.

test-non-interactive-wsgi: make output deterministic

hgweb: fix error in 38170eeed18c and introduce test for change

ui: add environ property to access os.environ or wsgirequest.environ The property returns os.environ by default, and is propagated by ui.copy. During hgweb processing, ui.environ is set to the proper WSGI-request environment, as contained in wsgirequest.environ. For CGI, this is the same as os.environ. The property is meant to be read-only, as with os.environ (generally).

relink: wrap long lines in docstring

test-convert-filemap: test improved filtering algorithm

convert: make filemap favor most specific filtering rule A filemap like: exclude "doc" include "doc/foo.txt" will now preserve doc/foo.txt and exclude everything else in doc/.

run-tests: set --home when building with distutils If home was set in ~/.pydistutils.cfg, the tests could not run. This overrides any home setting by supplying --home="" on the command line.

gitweb: add a latest link to the gitweb style

httprepo: suppress the `real URL is...' message in safe, common cases. When the actual and requested URL only differ by trailing slashes, there is no need to warn. As an example, this easily happens when accessing repositories on Bitbucket over HTTP(S). As far as I could tell, there were no existing tests for this behaviour.

merge with crew-stable

Extend test-branchmap to test c51494c53841 (encoding fallback in branchmap to maintain compatibility with 1.3.x)

branchmap: fix defective fallback fix 0262bb59016f The fix applied as 0262bb59016f doesn't work and is essentially a no-op. This fix also adds a comment about the nature of the problem, and a test.

Merge with stable

alias: improve help text for command aliases Displays the line "alias for: hg ..." with the original command including options, followed by the command's original help text.

dispatch: minor refactoring Renamed local variable i to entry in _dispatch.

qseries: don't truncate the patch name (issue1912) Instead of truncating the entire output line of `qseries', only the summary is truncated.

summary: note non-default branches with -q

Add stable branch

Added signature for changeset 31ec469f9b55

Added tag 1.4 for changeset 31ec469f9b55

i18n-ja: fixed bad indentation

Merge with crew

Allow import --no-commit over an applied MQ patch. Since it only changes the working directory, it does not matter whether a patch is applied. This change makes it easier to use hg import --no-commit instead of patch.

Merge with i18n

i18n-pt_BR: synchronized with crew 9c43089b372a

i18n-de: messages for 9e7b2c49d25d and translation of patchbomb

i18n-pt_BR: messages for 9e7b2c49d25d and cleanup

i18n-ja: synchronized with 004bf1d6e6af

support encoding fallback in branchmap to maintain compatibility with 1.3.x

convert/svn: fix warning when repo detection failed

inotify: workaround test-inotify-dirty-dirstate failures - disable inotify during clone - record inotify daemon PID, in order to have them properly killed

lock: the correct way to do a trylock() is to use a timeout of 0

diff: change --inverse to --reverse This fixes an incompatibility with patch(1), which also uses --reverse for reversed diffs. The --inverse flag was added in 3f522d2fa633. That name was chosen over --reverse since it was thought that --reverse would make --rev ambiguous. It turns out that both flags can co-exist, with the cost that --rev can no longer be shortened to --r and --re. Since one can always use the short -r option, this is not a real problem.

setup: pass LD_LIBRARY_PATH to subprocess when determining version.

inotify: Do not access inotify when dirstate is dirty (issue1811) Original patch was provided by Simon Heimberg It delegates dirstate computation to dirstate.status when dirstate is dirty: better be slow from time to time instead of using wrong data. This solves issue1719. As the last component, issue1810, is still not solved, test-inotify-dirty-dirstate will fail for now. It emphasizes a regression due to 7c01599dd340: changeset: 9515:7c01599dd340 user: Nicolas Dumazet <nicdumz.commits@gmail.com> date: Sun Aug 16 11:11:37 2009 +0900 summary: inotify: use cmdutil.service instead of local daemonizing code Ancestors of 7c01599dd30 are passing the test, when applied this patch. Regression has to be investigated, but this patch is important since it affects often mq operations.

inotify: mark directories visited during lookup (issue1844) Emulate the match.dir calls that are made in dirstate.walk: * first mark the visited directories on the server side * then extend the transmitted response to include this directory list * and lastly call match.dir on each directory

Merge with crew-stable

url: generalise HTTPS proxy handling to accomodate Python changes Python 2.6.3 introduced HTTPS proxy tunnelling in a way that interferes with the way HTTPS proxying is handled in Mercurial. This fix generalises it to work on Python 2.4 to 2.6.

Make it possible to debug failed hook imports via use of --traceback Prior to this change, if a Python hook module failed to load (e.g. due to an import error or path problem), it was impossible to figure out why the error occurred, because the ImportErrors that got raised were caught but never displayed. If run with --traceback or ui.traceback=True, hg now prints tracebacks of both of the ImportError instances that get raised before it bails.

Merge with i18n

i18n-pt_BR: synchronized with crew d3dbdca92458 messages for a40ec11795c3 still included

i18n-da: translate parentrevspec and record

i18n-da: translations in color, graphlog, mq

i18n-da: synchronized with a40ec11795c3

i18n-sv: synchronized with a40ec11795c3

i18n-pt_BR: synchronized with a40ec11795c3

merge: fix changectx.ancestor(workingctx) (issue1327)

hgweb: don't choke when an inexistent style is requested (issue1901)

pager: provide a default attend list The default list includes commands which normally print large amounts of text. This should be more user-friendly than paging all commands by default, which can be confusing when the pager swallows input prompts (with, e.g., record, merge, HTTP/SSH authentication, etc.)

Add missing bash_completion for qfinish

help: don't show extension list on extension help

convert/svn: fix HTTP detection bug introduced by 1b2516a547d4 The probe expected response is a 404 with content, and while urllib returns the response body in this case, urllib2 raises an HTTP error.

record: handle translated prompt correctly The prompt function would return 'y' or 'n' untranslated. This should therefore not be compared to _('y') and _('n'). However, it turns out that prompt could just as well return a good old Boolean.

doc/style: add orange border color to notes

hgrc.5: mark some words as inline literals

hgignore.5: fix typo

doc/style: fix typo in comment (by timeless)

doc/style: use default font color specified by user * it's bad to specify only foreground color: http://www.w3.org/QA/Tips/color * some people prefer dark background * `color: #111' is mostly the same as `color: black', which is the default of almost all popular browsers. so it's preferable to delete `color: #111', rather than adding `background-color: white'.

help: improve wording of update help text

hgrc.5: oft-requested "hg update" hook example

convert/svn: delegate to svn bindings if HTTP probe fails convert extension tries to guess the remote repository type with HTTP probes. Unfortunately, it does not handle authentication or HTTPS handshakes, so regular svn repositories may be excluded. Instead, when a non-404 error is retrieved, we keep trying with the svn bindings. The drawback is missing svn bindings will make the conversion to fail even for non-svn targets. This can be avoided with --source.

test-rebase-newancestor: make executable

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.

contrib/perf: profile diff of working directory changes

dispatch: better error message for --config option

mq: fix literal blocks in docstrings

convert/mtn: handle change in mtn 0.45 certs output

merge with crew

bundle: add test for Issue1704 Original version by Greg Ward.

bundle: don't send too many changesets (Issue1704) The fast path in changegroupsubset can send too many csets. This happens because it uses the parents of all bases as common nodes and then goes forward from this again. If a base has a parent that has another child, which is -not- a base, then this other child will nevertheless end up in the changegroup. The fix is to not use findmissing(), but use nodesbetween() instead, as do the slow path and incoming/outgoing. The change to test-notify.out is correct, because it actually hits this bug, as can be seen by glog'ing the two repos: @ 22c88 |\ | o 0a184 | | o | 0647d |/ o cb9a9 and o 0647d | @ cb9a9 It used to pull 0647d again, which is unnecessary.

convert: reenable SVN support after license issue solved

patchbomb: normalize date format in generated mboxes mbox format should use time.asctime(). Unfortunately, this function writes 2-characters day of week on Windows while unix one writes a single character. Normalize to Windows version since the other one can hardly be written with strftime().

hghave: be more tolerant to rst2html output On Windows, rst2html.bat calls rst2html.py, printing something like: "rst2html.py (Docutils" (notice the extra ".py")

test-convert-hg-svn: fix test output

rebase: make sure the newancestor is used during the whole update (issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.

buildrpm: enhance changelog of the RPM file Now the changelog is different depending if the parent is tagged: - for tags, keep the previous content, i.e. changelog of the tags. - for nightly build, changelog of the changesets since the latest tag As RPM is expecting strictly descending dates, I have used a python script to reorder the mercurial changelog.

buildrpm: build full RPM package including sources

buildrpm: cleanup script

buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.

buildrpm: warn if there is outstanding uncommitted changes

buildrpm: build from working dir parent and use hg version for RPM versioning Previous, RPMs was always built from tip, and the release number did not match the 'hg version' put in place for 1.4. This will enable also to this script to be able to build official tag and not only nightly build.

doc: fix language in CSS comments (by timeless)

setup: fix f51d1822d6fd refactoring, propagate env to runcmd

clone: simplify help text

Merge with main

i18n-zh: updated Chinese translation

i18n-da: synchronized with 6cb1808e5ae7

test-extension: Solaris grep don't know [[:digit:]]

merge with hg-stable

fix test-patchbomb on solaris

fix test-diffstat on solaris

doc: uppercase first letter in HTML man pages

Merge with crew

merge with crew

merge with stable

doc: styles for man page, which suit with the mercurial website designed loosely based on: http://mercurial.selenic.com/css/styles.css with some modifications by intention: * visited links are colored differently * no fixed size * works without typeface.js we keep most styles, which is from docutils, untouched. tested with: * MSIE 6.0 on Windows * Firefox 3.5 on Linux

rst2man: more robust uppercasing of section titles This handles section titles with child elements such as emphasis or inline literals.

doc: use titlecase in man page section titles

rst2man: automatically write sections in uppercase Man pages have uppercased section titles but other formats do not. Letting rst2man handle the tranformation allows better reuse of text between man pages and other formats.

relink: do not translate format string with no text

Use utf-8 encoding in test-branchmap's clone call After 75520c24feda it is printed in local encoding, i.e. "C" if not set otherwise.

Branch name printed since a3d73b3e1f8a now in local encoding.

Make test-branchmap executable and adjust output after a3d73b3e1f8a

ui: refer to "hg help config" when no username is set

help: add "hg help config" topic This is a condensed version of the first two sections of hgrc.5.txt. After a slight upgrade of minirst, we can move the whole of hgrc.5.txt into the config help topic and just let the man page include it.

hgrc.5: do not mention "name: value" syntax This was supported in versions prior to 1.3 where we used the standard Python ConfigParser. The new config parser never supported it.

submerge: properly deal with overwrites also pull .hgsubstate check out of inner loop

subrepo: add more debugging output, lose _ markers

subrepo: do a linear update when appropriate

subrepo: notice dirty subrepo states when merging

subrepo: add some debug output to submerge

Merge with i18n

i18n-sv: add missing newlines to translations

i18n-sv: simple translation fixes Fixed the fuzzy translations. Also took care of a few really simple strings, and translated the 'summary' command.

i18n-de: Update msgids, remove .txt linespecs + few small translations

i18n-pt_BR: synchronized with d942e06d7b14

Merge with main

i18n-da: synchronized with e06c940d554d plus some new translations

i18n-pt_BR: synchronized with e06c940d554d

i18n-zh_TW: synchronized with e06c940d554d

i18n-zh_CN: synchronized with e06c940d554d

i18n-sv: synchronized with e06c940d554d

i18n-ja: synchronized with e06c940d554d

i18n-it: synchronized with e06c940d554d

i18n-fr: synchronized with e06c940d554d

i18n-el: synchronized with e06c940d554d

Merge with main

i18n-da: synchronized

i18n-pt_BR: translate 'changeset' like 'revision' On Mercurial, 'changeset' and 'revision' may be used interchangeably, but the first is more or less untranslatable to a single word.

i18n: merge de and pt_BR translations

i18n-de: fixed inline emphasis The test-gendoc test said: gendoc-de.txt:1385: (WARNING/2) Inline emphasis start-string without end-string

i18n-pt_BR: fixed bullet list The test-gendoc test said: gendoc-pt_BR.txt:1475: (WARNING/2) Bullet list ends without a blank line; unexpected unindent.

i18n-pt_BR: synchronized with fc493cb90bb1

i18n-pt_BR: synchronized with 5287de171d74

i18n-de: Removed all fuzzies and translated small alphaend-extensions

i18n-pt_BR: synchronized with 02c43e8e0835

Fix up import test

subrepo: more robust split for .hgsubstate parsing

filectx: shortcut unrelated files in ancestor() (issue1327)

merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.

Related to Issue919: ui.progress, apparently unused before now, is busted.

Sometimes pushing to an HTTP repo fails with a useless message. abort: 'https://.../.../' does not appear to be an hg repository! Ought to produce a better diagnostics on the client. With patched 1.3.1, observed to produce an Apache HTML error message (from cgitb) including the vital text: File ".../hgwebdir.cgi", line 70, in ? wsgicgi.launch(application) File "mercurial/hgweb/wsgicgi.py", line 68, in launch File "mercurial/hgweb/hgwebdir_mod.py", line 91, in __call__ File "mercurial/hgweb/hgwebdir_mod.py", line 148, in run_wsgi File "mercurial/hgweb/hgweb_mod.py", line 100, in run_wsgi File "mercurial/hgweb/protocol.py", line 156, in unbundle File "mercurial/localrepo.py", line 2031, in addchangegroup File "mercurial/revlog.py", line 1204, in addgroup LookupError: 00manifest.i@......: unknown parent Might also be helpful if server's hgweb_mod.run_wsgi caught unexpected errors and returned a well-formed error response including the stack trace. The client patch would still be useful in this case, because it would let you diagnose issues with HTTP proxy servers and so on.

hg help resolve grossly mischaracterizes the --all switch

hgrc.5: mark more inline literals

hgrc.5: do not turn random URLs into links URLs and email addresses are automatically turned into links. We don't want that when talking about example links and addresses.

hgrc.5: use enumerated list for email charsets

hgrc.5: order of email charsets is not a top level literal block - it belongs under email charsets, not email in general - enumerate order

sshrepo: move mkstemp() out of the try block, we don't use the exception simpler fix for 3b6f18851d87

minirst: update module docstring

commands: use enumerated lists in help texts

minirst: support enumerated lists

minirst: prepare for general types of bullet lists The old code worked for '-' bullets only, but we can easily support variable width bullets.

minirst: combine list parsing in one function Bullet, option, field, and definition lists were parsed very similar code. They are now parsed by a single function (splitparagraphs). Some logic from the old parsing functions has been moved down to formatblock. This simplifies the parsing while putting the logic where it's really needed.