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

contrib: add a script to help diagnose raw output of the cmdserver

mq: eliminate explicit checks for file existence

mq: cleanup of lookup - handling of None is not relevant Patch specifications in mq is passed around as a string or None. None is generally used when no patch has been specified and there thus is nothing to lookup and the calling code should do something else. One code path did however pass None all the way to lookup. That case was handled in lookup, but there was really need for that, it was undocumented, and it used to cause trouble back when patches was specified as integers.

mq: fix corner cases for handling of patch 0 in qselect Most of the code paths in mq would always pass patch specifications as a string. Patches can be specified by their index, but one code path passed that (through pop) to lookup as an integer - all other code paths used a string. Unfortunately pop and lookup (like many other parts of mq) used the boolean value of the patch specification to see if it was None, and they would thus incorrectly handle patch 0 as None. This patch makes the code comply with the actual internal duck typing of patch specifications: patch indices must be encoded as strings. The (now) unused code for partial and thus incorrect handling of indices as integers is removed.

largefiles: cosmetics, whitespace, code style This is mainly about keeping code under the 80-column limit with as few backslashes as possible. I am deliberately not making any logic or behaviour changes here and have restrained myself to a few "peephole" refactorings.

largefiles: more work on cleaning up comments - always say "largefile", not "lfile" - cleanup mangled syntax, hopefully correctly (punctuation: it's your friend!) - wrap to 75 columns (where feasible)

largefiles: improve error reporting - tweak wording of some error messages - use consistent capitalization - always say 'largefile', not 'lfile' - fix I18N problems - only raise Abort for errors the user can do something about

largefiles: improve comments, internal docstrings - fix some ungrammatical/unclear/incorrect comments/docstrings - rewrite some really unclear comments/docstrings - make formatting/style more consistent with the rest of Mercurial (lowercase without period unless it's really multiple sentences) - wrap to 75 columns - always say "largefile(s)", not "lfile(s)" (or "big files") - one space between sentences, not two

largefiles: flush out tests to cover more operations and known cornercases

largefiles: speed up commit by only rewriting standins for modified largefiles

tests: add basic tests for doctest syntax

run-tests: end doctest block when seeing a non-command

tests: remove temp doctest file when finished running it

httprepo: make __del__ more stable in error situations Some errors could leave self.urlopener uninitialized and thus cause strange crashes in __del__. This member variable is now "declared statically" and checked for assignment before use.

tests: exercise some corner cases for mq guard selection and --reapply

tests: cleanup of test-fetch.t

tests: cleanup of echo statements left over from test conversion

graft: add examples and information about copied metadata

graft: add --continue support

graft: add user, date, and tool options

graft: add --edit

graft: add initial implementation

bookmarks: delegate writing to the repo just like reading This makes it easier for alternate storage backends to not use flat files for bookmarks storage.

tests: add support for inline doctests in test files This adds doctest like syntax to .t files, that can be interleaved with regular shell code: $ echo -n a > file >>> print open('file').read() a >>> open('file', 'a').write('b') $ cat file ab The syntax is exactly the same as regular doctests, so multiline statements look like this: >>> for i in range(3): ... print i 0 1 2 Each block has its own context, i.e.: >>> x = 0 >>> print x 0 $ echo 'foo' foo >>> print x will result in a NameError. Errors are displayed in standard doctest format: >>> print 'foo' bar --- /home/idan/dev/hg/default/tests/test-test.t +++ /home/idan/dev/hg/default/tests/test-test.t.err @@ -2,3 +2,16 @@ > >>> print 'foo' > bar > EOF + ********************************************************************** + File "/tmp/tmps8X_0ohg-tst", line 1, in tmps8X_0ohg-tst + Failed example: + print 'foo' + Expected: + bar + Got: + foo + ********************************************************************** + 1 items had failures: + 1 of 1 in tmps8X_0ohg-tst + ***Test Failed*** 1 failures. + [1] As for the implementation, it's quite simple: when the test runner sees a line starting with '>>>' it converts it, and all subsequent lines until the next line that begins with '$' to a 'python -m heredoctest <<EOF' call with the proper heredoc to follow. So if we have this test file: >>> for c in 'abcd': ... print c a b c d $ echo foo foo It gets converted to: $ python -m heredoctest <<EOF > >>> for c in 'abcd': > ... print c > a > b > c > d > EOF $ echo foo foo And then processed like every other test file by converting it to a sh script.

tests: add helper script for processing doctests read from stdin Writes stdin to a temp file and doctests it. In the future we might want to spare the temp file and directly call into doctest. Also, with some tweaking it seems possible to adjust the line numbers reported in an error report so they match the ones in the original file.

subrepo: fix git branch tracking logic (issue2920)

alias: don't shadow commands that we only partially matched (issue2993) (BC) Previously, if you set an alias for "ci", it'd also shadow "commit" even though you didn't specify that. This occurred for all commands with explicit short variations.

resolve: update documentation to mention the .orig backup

cmdutil.bailifchanged: abort for dirty subrepos

largefiles: improve help Extension help taken from the URL formerly in the text (https://developers.kilnhg.com/Repo/Kiln/largefiles/largefiles/File/usage.txt) and improved.

largefiles: use ui.configlist() to split largefiles.patterns

largefiles: allow minimum size to be a float Some old-fashioned people (e.g. me) think that incompressible binary files >100 kB count as "large".

largefiles: factor out lfutil.getminsize()

largefiles: cleanup import, now that we can assume > 1.9 for bundled extension

largefiles: add test for status

largefiles: remove pre-1.9 code from extension first bundled with 1.9

pyflakes: clean up some import noise

bdiff: fix pointer aliasing

import: add --edit switch

transplant: add --edit option

rebase: add --edit switch

httpclient: update to 07d8c356f4d1 of py-nonblocking-http This addresses a defect when the server closes the socket before finishing a response (if it crashes, for example) first spotted in Issue2951.

wireproto: do not call pushkey module directly (issue3041) Call the repos pushkey/listkeys member function instead. So the pushkey-hooks are triggered.

largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)

setup: add largefiles to list of packages

rebase: move updatedirstate into cmdutil so it can be shared