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)