posix: fix findexe() to check for file type and access

subrepo: use correct paths for subrepos with ..-relative paths on windows posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.

add missing localization markup

url: handle file://localhost/c:/foo "correctly" The path was parsed correctly, but localpath prepended an extra '/' (as in '/c:/foo') because it assumed it was an absolute unix path.

help: it is 'file://localhost/', not 'file://local/' The documentation has apparently always been wrong.

setup: support executing with python3 including 2to3 Merge the code from contrib/setup3.py in setup. The argument for executing is marked as experimental. Reason: The file in contrib was outdated (packages, cmdclass, ...)

setup: hgbuildmo inherits from Command hgbuildmo does not need anything provided by the build class.

setup: make script executable with python3 Replace the incompatible print statement. Writing a warning to stderr is a good idea anyway.

bookmark: remove excess creation of changectx's

bookmark: same order for options and code

merge with stable

dirstate: fix case-folding identity for traditional Unix We used to use os.path.normcase which was a no-op, which was unhelpful for cases like VFAT on Linux.

convert/bzr: fix test of divergent nested renames for bzr 1.x 54c0517c0fe8 introduced a new block in test-convert-bzr-directories.t which produces a slightly different output with older bzr versions. Tested with bzr 1.5 on Debian lenny.

phases: set common changeset to public on pull

phases: mark content pushed as public in local repo on push

phases: marked content of a changegroup as published

phases: set new commit in 1-phase

phases: add retractboundary function to move boundary backward The advanceboundary documentation is updated to highlight the difference.

phases: rename moveboundary into advance boundary This rename prepare the creation of retract boundaru that move boundary backward

phases: remove underbar into target_phase argument

merge with stable

tests: fix trailing whitespace

merge with stable

mq: add a warning about uncommitted changes for qfinish

hgweb: add hint about finding library path with debuginstall

forget: support forgetting explicit paths in subrepos Change the behavior of the forget command such that explicit paths in subrepos are handled by forgetting the file in the subrepo. This eliminates the previous behavior where if you called "hg forget" for an explicit path in a subrepo, it would state that the file is already untracked.

tests: add test for behavior of forget for explicit path in subrepo Adds a section to test-subrepo.t that demonstrates the current behavior when you pass the full path to a file in a subrepo to hg forget.

largefiles: treat status of cache missed largefiles as "missing" correctly "hg status" may treat cache missed largefiles as "removed" incorrectly. assumptions for problem case: - there is no cache for largefile "L" - at first, update working directory to the revision in which "L" is not yet added, - then, update working directory to the revision in which "L" is already added and now, "hg status" treats "L" as "removed". current implementation does not allocate entry for cache missed largefile in ".hg/largefiles/dirstate", but files without ".hg/largefiles/dirstate" entry are treated as "removed" by largefiles extension. "hg revert" can not recover from this situation, but "rm -rf .hg/largefiles", because it causes dirstate rebuilding. this patch invokes normallookup() for cache missed largefiles to allocate entry in ".hg/largefiles/dirstate", so "hg status" can treat it as "missing" correctly.

merge with stable

merge with i18n

rebase: ensure target is not taken as external (issue3085) This could happen in specific situations in which 'target' was selected as external and used for p1 _and_ p2.

merge with i18n

i18n: merge with stable

i18n-da: add new strings from Mercurial 2.0

i18n-ru: fix translation of --logfile (issue3095)

rebase: treat nullmerge as a special case in rebasestate (issue3046) When storing/restoring a nullmerge (-2), a 'standard' conversion was made and an existing changeset was wrongly used. Nullmerge should instead be treated as a special case.

graft: mark a string for translation

mdiff/patch: fix bad hunk handling for unified diffs with zero context Prior to this patch "hg diff -U0", i.e., zero lines of context, would output hunk headers with a start line one greater than what GNU patch and git output. Guido van Rossum documents the unified diff format[1] as having a start line value "one lower than one would expect" for zero length hunks. Comparing the behaviour of the three systems prior to this patch in transforming c1 c3 to c1 c2 c3 - GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@" - "git diff -U0" reports the hunk as "@@ -1,0 +2 @@" - "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@" After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@". Since "hg export --config diff.unified=0" outputs zero-context unified diffs, "hg import" has also been updated to account for start lines one less than expected for zero length hunk ranges. [1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293

convert/bzr: correctly handle divergent nested renames (issue3089) With renames like: a -> b a/c -> a/c We were ignoring or duplicating the second one instead of leaving files unchanged or moving them to their proper destination only. To avoid this, we process the files in reverse lexicographic order, from most to least specific change, and ignore files already processed. v2: - Add a test - Change "reverse=1" into "reverse=True"

setup: subclass build command

setup: has_ext_modules always returns false when pure is specified When pure is specified ext_modules is emptied in hgbuildpy.finalize_options. Before this happens has_ext_modules returned True.

setup: subclass distribution instead of overwriting original

check-code: enable camelcase check, fix up problems

phases: handle unknown nodes in boundary We filter unknown node out of the boundary. No data is lost. A filtering is explicitly done after strip too

phases: add rollback support

phases: add a moveboundary function to move phases boundaries Also include logic to detect when to write phases data.

phases: improve context.phase() * force recompute of outdated cache * handle nullrev case

util: don't encode ':' in url paths ':' has no special meaning in paths, so there is no need for encoding it. Not encoding ':' makes it easier to test on windows.

run-tests: make $TESTTMP matching case-insensitive on windows

run-tests: don't quote command names - that do apparently not work with msys

tests: ignore \r on windows

run-tests: convert windows paths to unix

tests: make (glob) on windows accept \ instead of / Globbing is usually used for filenames, so on windows it is reasonable and very convenient that glob patterns accepts '\' or '/' when the pattern specifies '/'.

tests: use 'hghave serve' to guard tests that requires serve daemon management

tests: use 'hghave system-sh' to guard tests that requires sh in system()

tests: use 'hghave no-windows' to avoid testing reserved file names on windows

tests: use 'hghave unix-permissions' for tests that really use chmod chmod of helper scripts is not included. tests that exercise the x bit in the file system uses 'hghave execbit'.

tests: use 'hghave execbit' for tests that manipulate x bit in file system

tests: use 'hghave symlink' for tests using symlinks

windows: use umask 022 in debugstate output debugstate would always report files as mode 666 or 777 on Windows. umask is not used on Windows, but faking and using a defalt value of 022 matches what the test suite uses on Unix.

dispatch: exit with 8-bit exit code The exit code returned from a program to the shell is unsigned 8-bit, but Mercurial would sometimes try to exit with negative numbers or None. sys.exit on Unix will convert that to 8-bit exit codes, but on Windows negative values showed up as 0. The exit code is now explicitly converted to unsigned 8-bit.

tests: don't let time go back before 0 o'clock in bisect3.t Windows agree that it was Thu Jan 01 00:00:00 1970 +0000 but it also claims that it was Thu Dec 31 23:59:59 1969 -0000

diff: always use / in paths in diff Subrepo diffs would sometimes use backslash on windows.

cmdutil: don't use repr on paths in pathauditor - it looks strange on windows

tests: make '(esc)' matching in run-tests.py work as intended The code for match on (esc) lines didn't work, and it would thus always end up emitting another suggestion ... which however would match the old one.

run-tests: replace inline python handling with more native scheme Normally changes in tests are reported like this in diffs: $ cat foo - a + b Using -i mode lets us update tests when the new results are correct and/or populate tests with their output. But with the standard doctest framework, inline Python sections in tests changes instead result in a big failure report that's unhelpful. So here, we replace the doctest calls with a simple compile/eval loop.

merge with crew

merge with stable

merge with main

merge with main

subrepo: improve help for svn subrepo support Add details on which commands are supported for Subversion subrepos.

subrepo: improve help for git subrepo support Add details on which commands are supported for git subrepos.

subrepo: update help for commit to reflect new default behavior Update the subrepo help to be consistent with the new default behavior, which is to abort if any subrepo is dirty.

merge with stable

i18n: disable translations with conflicting prompt keys (issue3082) This is just a stopgap until a proper solution is implemented.

log: hide hidden option until it actually does something

phases: add a very simple test Note that the expected output is wrong as is should be phase-1. But the machinery to plant new root is to come in later commit.

phases: add a phase template keyword

phases: add a phase method to context

phases: add a cache allowing to know in which phase a changeset is

phases: handle errors other than ENOENT appropriately

phases: basic I/O logic Add function to read and write phase roots. Add a _phaseroots filecache on localrepo class to access the phaseroots data.

phases: Minimal first add.

run-tests: minor cleanups

run-tests: pull out line matching function

run-tests: pull out unified matching funcs

tests: add some comments to the unified test code

tests: rewrite inline Python support Tests with inline Python could turn '>>>' into their underlying python invocation if the test got updated with -i.

merge with stable

add: support adding explicit files in subrepos Change the behavior of the add command such that explicit paths in subrepos are always added. This eliminates the previous behavior where if you called "hg add" for an explicit path in a subrepo without specifying the -S option, it would be silently ignored. If you specify patterns, or no arguments at all, the -S option will still be needed to activate recursion into subrepos.

tests: add test for add of explicit path in subrepo Add test coverage for the existing behavior where adds of explicit paths in subrepos are silently ignored. This is in preparation for changing the behavior of the add command to have better support for subrepos.

largefiles: ensure destination directory exists before findfile links to there When (1) findfile links a largefile from the user cache to the store and (2) the store directory doesn't exist yet, findfile errors out. A simple call to util.makedirs fixes it.

misc: adding missing file close() calls Spotted by Victor Stinner <victor.stinner@haypocalc.com>

bisect: remove superfluous parameter in label() The argument is not used. This is a left-over of non-published iterations, and it passed through. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

log: hide some low-utility options

localrepo: convert various repo.set() users to repo.revs()

localrepo: add revs helper method

merge with stable, reopen default branch

Added signature for changeset 41453d55b481

Added tag 2.0 for changeset 41453d55b481

dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.

tests: fix readline escape characters in heredoctest.py/test-url.py This fix mirrors the changes made to test-doctest.py in b856071435f7 and 967adcf5910d. Without this change, tests running heredoctest.py can fail on certain versions of OS X when TERM is set to xterm-256color: $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF > >>> open('b', 'w').write('this' * 1000) > EOF + \x1b[?1034h (no-eol) (esc) A similar problem occurs with test-url.py: $ ./run-tests.py test-url.py --- .../tests/test-url.py.out +++ .../tests/test-url.py.err @@ -0,0 +1 @@ + ERROR: .../test-url.py output changed ! Failed test-url.py: output changed # Ran 1 tests, 0 skipped, 1 failed.

merge with i18n

i18n-pt_BR: synchronized with a53888685a6c

merge with i18n

i18n-ja: synchronized with b357a972d6cd

minirst: use unicode string as intermediate form for replacement # this change redones part of 521c8e0c93bf, backed out by 0ad0ebe67815 Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences. [mpm: test changed to simple doctest]

util: add a doctest for empty sha() calls

largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp This is consistent with the rest of Mercurial's code, mirroring the try-finally-unlink structure elsewhere. Furthermore, it fixes the case where largefiles throws an IOError on Windows when the temporary file is opened a second time by copytocacheabsolute. This patch creates the temporary file in the repo's largefiles store rather than /tmp, which might be a different filesystem.

util: allow sha1() with no args Normally this works because we replace util.sha1 with hashlib.sha1 after first use, but if the first user doesn't provide an arg, it breaks.

tests: use md5sum.py instead of sha1sum, add check

setup: set whole env for running hg even if .hg doesn't exist (issue3073) The issue was partially fixed by b357a972d6cd, but there were missing variables to run build_hgextindex.

keyword: backout realpath change (issue3071)

strip: backout 73307643a09f (issue3077)

largefiles: avoid checking requirements on every command When largefiles is enabled, commands on large repositories which don't require largefiles could be slowed down substantially. Disable checking this for every command.

largefiles: shorten test suite by using log --template

largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on

largefiles: test that a largefile cannot accidentally be re-added as a regular file

backout dbdb777502dc (issue3077) (issue3071) Using util.realpath turns out to create complex issues on both Mac and Windows. Back this change out for the release.

largefiles: fix uppercase in abort message

Makefile: adjust example, test-merge1 is now test-merge1.t

tests: use $DAEMON_PIDS and killdaemons in largefiles test $DAEMON_PIDS is used by tests to make sure there will be no leftover processes, the cycling through ports is needed because they are not available for a new bind that quickly on some systems. There are not enough $HGPORT variables available for each hg serve, so use the killdaemons script before reusing ports.

tests: make largefiles test use $HGPORT instead of 8001

merge in another fix on the wrong branch

hgweb: fix dynamic date calculation not working under Safari While Chrome, Firefox, and IE 6+ support the current date format being passed to Date(), Safari doesn't: > new Date('Mon Oct 24 13:58:01 2011 +0200') Invalid Date However, the rfc822date format--officially supported by ECMAScript[1]--does work: > new Date('Mon, 24 Oct 2011 13:58:01 +0200') Mon Oct 24 2011 04:58:01 GMT-0700 (PDT) This change replaces all instances of {date|date} in HTML with {date|rfc822date}. For elements that only have the "age" class, there's no outward change for users with JavaScript enabled. For elements with both the "age" and "date" classes, the full date displayed uses the new format. Tested in IE 6, Safari 5.1.1, Google Chrome 15, and Firefox 7.0.1. [1]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse

tests: fix spurious largefiles test failure on Cygwin

revert: fix missing removes when parent was changed in dirstate When dirstate parent is changed with dirstate.setparent before a revert so it no longer points to where the dirstate refered to, revert does not remove all files it should: Revert to a different revision needs also to remove files that are not found through disptables and not in the context or parent manifest.

check-code: fix issues with finding patterns in unified tests, fix tests - old-style patterns without ^ were getting improperly anchored - finditer was matching against beginning of line poorly - \s was matching newlines - [^x] was matching newlines so we: - remove earlier hacks for multiline matching - fix unified test anchoring by adding .* - replace \s with [ \t] - replace [^x] with [^\nx] - force all matches into multiline mode so ^ anchors work This uncovers a number of test issues that are then repaired.

largefiles: remove lfutil.createdir, replace calls with util.makedirs

largefiles: fix typo

largefiles: bugfix for symlink handling with testcase The code was using the size of a symlink's target, thus wrongly making symlinks to large files into largefiles themselves. This can be demonstrated by deleting the symlink and then doing an 'hg up' or 'hg up -C' to restore the symlink.

i18n-it: fixed wrong message

setup: set env global earlier (3073)

largefiles: test reverting largefiles (coverage creeping ever upwards) This reveals a small bug: revert reports "reverting .hglf/largefile" when it really should report "reverting largefile". I don't see an easy fix, though (short of using ui.pushbuffer() to interfere with revert's output).

largefiles: test "update --check" It works fine; I'm just getting the test coverage up.

tests: fix check-code detection of anchored expressions, fix echo -n usage

diffstat: be more picky when marking file as 'binary' (issue2816) The 'Bin' marker was added to every changed file for which we could not find any diff changes. This included binary files but also copy/renames and mode changes. Since Mercurial regular diff format emits a 'Binary file XXX has changed' line when fed with binary files, we use that and the usual git marker to tell them from other cases. In particular, new empty files are no longer reported as binary. Still, this fix is not complete since copy/renames/mode changes are now reported as '0' lines changes, instead of 'Bin'.

i18n-pt_BR: synchronized with b74f74b482d8

graft: add a test

graft: fix duplicate filter logic

graft: fix duplicate scan message

util: don't complain about '..' in path components not working on Windows

graft: fix formatting of message

largfiles: drop unused import

consistency: use util.realpath instead of os.path.realpath where useful exceptions: hg: os.path.realpath used before util can be imported tests/run-tests.py: may not import mercurial modules

keyword: use util.realpath instead of os.path.realpath This makes test-keyword.t pass on Python 2.4.1 (e.g. Debian sarge)

posix: workaround for os.path.realpath bug in Python 2.4.1 and before os.path.realpath didn't resolve symlinks that were the first component of the path, see http://bugs.python.org/issue1213894

largefiles: improve markup in module help text

largefiles: remove redundant documentation The extension help text already covered what was in usage.txt and design.txt is now moved to the wiki: http://mercurial.selenic.com/wiki/LargefilesExtension

largefiles: use ui.configpath() where appropriate

largefiles: drop more unnecessary compatibility checks

windows: sanity-check symlink placeholders On Windows, we store symlinks as plain files with the link contents. Via user error or NFS/Samba assistance, these files often end up with 'normal' file contents. Committing these changes thus gives an invalid symlink that can't be checked out on Unix. Here we filter out any modified symlink placeholders that look suspicious when computing status: - more than 1K (looks more like a normal file) - contain NULs (not allowed on Unix, probably a binary) - contains \n (filenames can't contain \n, very unusual for symlinks, very common for files)

largefiles: use util.sha1() instead of hashlib.sha1() everywhere

tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions

convert: add missing import of util, needed for svn < 1.6

run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t If no_proxy (or NO_PROXY) includes localhost, the test for detecting an unreachable proxy fails, because the proxy setting is ignored.

largefiles: test "lfconvert --to-normal" with rename/remove/merge This gets us very close to full test coverage of lfconvert. The only features not tested are: - .hgtags conversion - abort when largefile becomes symlink

largefiles: test lfconvert with rename, remove, and merge

largefiles: beef up test-lfconvert.t so it's more thorough - instead of converting a single changeset with a single file, convert two changesets which each add a mix of normal and large files - make one of the large files not-so-large, but identified as large by filename - use shorter, simpler filenames - put some files in a subdirectory - test that file contents are correctly converted - drop unnecessary cleanup step

largefiles: rearrange how lfconvert detects non-local repos Mainly this is so we can test that code; it has the side benefit of not requiring network I/O to reject non-local repo URLs.

largefiles: test lfconvert error handling; remove redundant code

largefiles: extract test-lfconvert.t from test-largefiles.t test-largefiles.t is getting pretty big, and there's lots more to test in lfconvert. And lfconvert is a fairly orthogonal feature to the rest of largefiles.

windows: recompute flags when committing a merge (issue1802) Before this patch, Windows always did the wrong thing with exec bits when committing a merge: consult the flags in first parent. Now we manually recompute the result of merging flags at commit time, which almost always does the right thing (except when there are conflicts between symlink and exec flags). To do this, we: - pull flag synthesis out into its own function - delay building this function unless it's needed - add a merge case that compares flags in local and other against the ancestor This has been tested in multiple ways on Linux: - running the whole test suite with both old and new code in place, checking for differences in each flags() result - running the whole test suite while comparing real on-disk flags against synthetic ones for merges - test-issue1802 (from Martin Geisler) which disables exec bit checking on Unix

largefiles: test interaction between largefiles and vanilla clients and servers This reintroduces tests for the case described by issue3066, among others: - vanilla clients and servers should still be able to talk to largefiles clients and servers about vanilla repos - vanilla clients should not attempt to clone largefiles repos over http and should report a useful error message (issue3066; this appears to work correctly) - vanilla clients should not attempt to clone largefiles repos over ssh, again with a useful error message - largefiles clients should not attempt to push largefile changes to vanilla servers

tests: darcs > 2.5 got "smart" about encoding, disable encoding tests We can no longer convert a repo with mixed encodings, nor can I even figure out how to get Darcs to display such messages.

check-code: catch BaseException and os.path.relpath

largefiles: py2.4 doesn't have BaseException ..and it's the wrong base class anyway.

largefiles: rename lfconvert --tonormal option to --to-normal

largefiles: test lfconvert --tonormal

largefiles: use smaller files in test script

largefiles: test that minimum size can be a float This allows us to drop the existing test of --lfsize, since it's redundant with the new test.

largefiles: polish comments in test script

import: abort usefully if no patch name given

revset: disambiguous the node variable The module could be confused with the function.

revset: deal with empty lists in formatspec

keyword: correct grammar in iskwfile docstring

largefiles: remove all uses of os.path.relpath for 2.4 compatibility

mq: avoid data loss upon qfold + qmv (issue3058) When renaming a patch A as B where B was previously qfolded into A and therefore marked as removed, a versioned MQ would first restore B before marking it as a copy of A, thus losing A changes. The undelete() call is probably a left-over, wctx.copy() explicitely handles the case where the destination is removed. Also note that status command represents "hg rm b; hg mv a b" as: A b a R a which explains the first hunk in test-mq-qrename.t.

subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g

largefiles: use XDG and OS X-specific cache locations by default (issue3067)

largefiles: remove redundant any_ function

largefiles: testcase to simulate inter-user clone on local machine

largefiles: make the store primary, and the user cache secondary This uses the now-properly-named functions and methods from the previous patch to actually deliver the desired behavior

largefiles: rename functions and methods to match desired behavior The original intent was that the largefiles would primarily be in the repository, with the global cache being only that--a cache. The naming conventions and actual intent have both strayed. In this first patch, the naming conventions are switched to match the actual intent, as are the configuration options.

largefiles: fix documentation to match desired behavior

runrst: improve error message when Docutils is missing Peter Toft told me he had installed a 'python-doc' package instead of the correct 'python-docutils' and he suggested that we add the URL to Docutils in our error message.

largefiles: fix newline for lfconverted repos

largefiles: remove 1.9 compat code

merge with i18n

i18n-pt_BR: synchronized with ab341fbb05b1

i18n-pt_BR: msgmerge with ab341fbb05b1

bisect: add i18n contexts

import: add i18n context

largefiles: fix some badly named function parameters overrides.py contains several functions that temporarily override scmutil.match(), which always takes a changectx object as the first parameter. But these overrides name that parameter either 'repo' or 'ctxorrepo', which is misleading. So rename them to 'ctx' and remove the special type-sensitive handling of the one called 'ctxorrepo'.

largefiles: tidy imports - no need to defensively import scmutil - remove duplicate - unwrap non-long line

largefiles: rename config setting 'size' to 'minsize'

largefiles: include 'largefiles' in converted repository requirements

largefiles: string formatting typo in basestore._openstore where comma is used instead of modulo

largefiles: fix test typo

convert: fix typo

largefiles: fix typo

largefiles: test that merging does not result in wrong versions of largefiles

largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)

check-code: report suspicious string joins This detects patterns of the form: ui.write("this is missing" "a space at the join\n")

largefiles: fix typo

largefiles: make parameter more i18n-friendly

grep: correct handling of matching lines without line ending (issue3050) Matching lines without trailing '\n' was missing the last character. That seems to have been an unintended side effect of 261a9f47b44b. The test in dac14cc9711e documents the bad behaviour.

discovery: Fix error print mentioning a 'None' branch When talking to old server discovery use heads of the 'None' branch to refer to topological heads. This use of None should never make it to the end user.

largefiles: remove fixme from docs

i18n: import polib 0.6.4 (rev 84598f2b5365) This version fixes some upstream issues observed during the pt_BR translation update: #8 (obsolete entries reappearing); an unidentified issue that made i18n/posplit produce some spurious messages on the resulting po file; possibly others. These bugs probably didn't cause actual differences on the translated output, since an invalid message added to the .mo file wouldn't match an input message most of the time. But they do pollute the .po file contents (and diffs), adding some confusion to the translation process. db957a72fbd7, 4c50552fc9bc and 8ea51e9e7031 were included upstream, so the only remaining difference is the "no-check-code" marking.

rebase: fix typos

auth: fix realm handling with Python < 2.4.3 (issue2739)

subrepo: abort in hgsubrepo._get if the destination is obstructed Before, we deleted foo when we determined that there were zero changesets in the foo subrepo. Any files in foo was deleted too. We now delete foo/.hg instead, and the normal checks in hg.clone will then abort if there are untracked files in foo.

subrepo: pull revisions on demand when archiving hg subrepos Before, running 'hg archive -S' could result in abort: unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'! if a subrepo was missing completely or had missing changesets. Now, the missing changesets will be pulled or cloned as appropriate. This make Mercurial subrepos match Git subrepos which already took care to fetch any missing commits before starting the archive.

test-check-code.t: test matching try/except/finally introduced in aeeb2afcdc25

merge with crew

merge in commit that shouldn't be on default

tests: don't use 'test -e' On Solaris 10: $ test -e f test: argument expected

check-code: support multiline matches like try/except/finally - match one pattern at a time against entire file - find line containing match - sort matches by line number

fix bad tag for 2.0-rc This tag was immediately stripped, but not before escaping onto the hg-stable mirror.

largefiles: use separate try/except and try/finally as needed for python2.4 cfccd3bee7b3 introduced a try/except/finally block, which breaks compatibility with python2.4

commands: use separate try/except and try/finally as needed for python2.4 62dc0e7ab092 introduced a try/except/finally block, which breaks compatibility with python2.4

Added signature for changeset fccd350acf79

Added tag 2.0-rc for changeset fccd350acf79

Added signature for changeset 384082750f2c

Added tag 2.0-rc for changeset 384082750f2c

merge default into stable for 2.0 code freeze

rebase: simplify check for orphaned descendants

rebase: simplify set generation

rebase: add --rev option to rebase This option allow a strict set of revision to be specified instead of using -s or -b. Rebase will refuse start if striping rebased changeset will strip non rebased changeset. Rebase will refuse to work on set with multiple root.

rebase: allow revsets for source and base args

revset: fix %r handling in formatspec

rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py

revset: add %r for embedded revset support to formatspec This allows folding external revsets or lists of revsets into a revset expression. Revsets are pre-parsed for validity so that syntax errors don't escape.

revert: warn that subrepos cannot be reverted (tests added by mpm)

merge: expand environment variables and ~/ in tool.executable hgrc(5) already implies that this works, so we might as well support it. Another approach would be to implement this in util.findexe(): that would benefit other callers of findexe(), e.g. convert and anyone calling the user's editor. But findexe() is really implemented in both posix.py and windows.py, so this would make both of those modules depend on util.py: not good. So keep it narrow and only for merge tools.

minirst: improve test harness

minirst: add style flag to format

minirst: add basic HTML formatting support

graft: use status verbosity for reporting grafts