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

subrepo: add git to the help topic

branch: fix formatting of help note

backout: deprecate/hide support for backing out merges This has never worked usefully: - it can't undo a completely unwanted merge, as it leaves the merge in the DAG - it can't undo a faulty merge as that means doing a merge correctly, not simply reverting to one or the other parent Both of these kinds of merge also require coordinated action among developers to avoid the bad merge continuing to affect future merges, so we should stop pretending that backout is of any help here. As backing out a merge now requires a hidden option, it can't be done by accident, but will continue to 'work' for anyone who's already dependent on --parent for some unknown reason.

backout: add a note about not working on merges

backout: mark some help verbose

merge with stable

acl: more descriptive error messages

largefiles: fix commit of specified file on non-windows

convert: detect false cset boundaries in cvsps descriptions

transplant: wrap a transaction around the whole command

help: generate command help into a single RST string for formatting

help: unify the two -v notes for command help

diff: enhance highlighting with color (issue3034) Now the highlighter knows whether it is in the header of the patch or not.

debuginstall: report the template path

extensions: print some debug info on import failure This is handy if hgext.foo exists but has a bogus "import blah": previously we just discarded the "No module named blah" error. Now at least you can see it with --debug. Not perfect, but better than nothing.

import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now.

import: improve error reporting When applying a series of patch files, it's nice to be explicitly told *which* file is broken.

import: join base with patchurl *after* checking for stdin This only matters when using the deprecated --base option, and combining --base with a patch on stdin makes no sense. But it's such an obvious bug and easy fix that I couldn't pass it by.

import: rename some local variables

import: simplify status reporting logic (and make it more I18N-friendly) The old code printed (with ui.status()) the changeset ID created by patch N after committing patch N+1, e.g. applying patch1 applying patch2 applied 1d4bd90af0e4 where 1d4bd90af0e4 is the changeset ID resulting from patch1. That's just weird. It's also inconsistent: we only reported the changeset ID when applying >1 patches. And it's inconsistent with 'commit', which only tells you the new changeset ID in verbose mode. Finally, the existing code was I18N-hostile, since it concatenated translated strings. The new way is to print the just-created changeset ID with ui.note() immediately after committing it. It also clarifies what the user message is for easier I18N.

convert: fix crazy rollback call, broken by recent rollback safety checks This was causing test-convert-cvs.t to fail.

rst: fix detection of single-row tables This fixes option lists for commands with only an --mq option.

subrepo: fix repo relative path calculation for root directories (issue3033)

subrepo: improve error message when svn isn't found subprocess was returning the following unhelpful message: abort: No such file or directory