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.