obsolete: warns if markers exist in a repo where the feature is not enabled We don't simply abort to allow the user to run other diagnostic commands.

obsolete: introduce an `_enabled` switch to disable the feature by default Obsolete markers wide-usage and propagation should be avoided by default until the obsolete feature is more mature. This changeset introduce the `_enable` variable and prevent the creation of obsolete marker if the feature is set to `False` (the default). More limitation comes in followup changesets.

pushkey: splits obsolete marker exchange into multiple keys Obsolete markers are now exchanged in smaller pieces that fit in a http header. This changes is done to avoid 400 bad request error when exchanging obsolete puskey over http. The last key pushed is always hold by the "dump0" key to ensure an easy place to hook for people who need it.

obsolete: add debug output regarding obsolete marker exchange.

pushkey: add more verbose debug output regarding pushkey Very few data are displayed now, making it hard to debug phases and obsolete related issues.

debugobsolete: do not traceback on invalid node identifiers

revset: minor doc fixes on obsolete related revsets

hgweb: make paper:error consistent with template Tests fixed by Patrick Mézard <patrick@mezard.eu>

hgweb: avoid traceback when file or node parameters are missing Previously, browsing to http://serv/diff would generate an internal server error due to the file and node parameters being missing. The same error also occurred for filelog, comparison and annotate.

hgweb: fix "branches" links in gitweb template Tests fixed by Patrick Mézard <patrick@mezard.eu>

hgweb: fix typo in monoblue template

hgweb: fix capitalization in monoblue template Make the capitalization consistent on all pages.

histedit: add trailing newline when editing commit messages test-histedit-edit.t failed because Solaris sed strips lines not ending with \n.

test-histedit-outgoing.t: remove unused section

test-hook.t: Solaris /usr/bin/egrep do not support {4}

merge with i18n

i18n-sv: continue translating mq extension

i18n-sv: translated record extension

i18n-sv: synchronized with a09cc6aeed4a

win32: update Inno Setup installer extensions list

hgweb: avoid traceback if raw is used as default style Spotted by Angel Ezquerra.

largefiles: use hg.peer instead of hg.remoteui

histedit: remove updating statistics line from the examples describing rules Before this patch, updating statistics line appears at the bottom of the examples describing rules to edit history. But such line never appear in the file describing rules while histedit-ing, so this patch removes that line from the examples.

hgignore: ignore zip files

peer: delete double definition of method peer

revset: fix the definition of "unstable changesets" for "unstable" predicate unstable-ness of changesets should be determined by obsolete-ness of not descendants but ancestors.

largefiles: support revsets for outgoing --large Previous to this, outgoing with a revset succeeded unless --large was also specified.

largefiles: fix a traceback introduced with recent peer changes Changeset 1ac628cd7113 broke 'outgoing --large' ... File "hgext\largefiles\lfutil.py", line 56, in findoutgoing remote.local(), force=force) File "mercurial\discovery.py", line 31, in findcommonincoming if not remote.capable('getbundle'): AttributeError: 'lfilesrepo' object has no attribute 'capable' This restores the previous functionality, though I'm not sure if there's a better way to do this- that changeset introduces a hunk in debugdiscovery that does this: if not util.safehasattr(remote, 'branches'): # enable in-client legacy support remote = localrepo.locallegacypeer(remote.local()) Is there a legacy support issue here too?

largefiles: support revsets for cat Previous to this, cat only accepted revsets if the largefiles extension was disabled.

largefiles: support revsets for revert Previous to this, revert only accepted revsets if the largefiles extension was disabled.

doc: unify section level between help topics Some help topics use "-" for the top level underlining section mark, but "-" is used also for the top level categorization in generated documents: "hg.1.html", for example. So, TOC in such documents contain "sections in each topics", too. This patch changes underlining section mark in some help topics to unify section level in generated documents. After this patching, levels of each section marks are: level0 """""" level1 ====== level2 ------ level3 ...... level4 ###### And use of section markers in each documents are: - mercurial/help/*.txt can use level1 or more (now these use level1 and level2) - help for core commands can use level2 or more (now these use no section marker) - descriptions of extensions can use level2 or more (now hgext/acl uses level2) - help for commands defined in extension can use level4 or more (now "convert" of hgext/convert uses level4) "Level0" is used as top level categorization only in "doc/hg.1.txt" and the intermediate file generated by "doc/gendoc.py", so end users don't see it in "hg help" outoput and so on.

addremove: mention --similarity defaults to 100 (issue3430)

revset: polish explanation of the difference between file() and filelog()

strip: move bookmarks to nearest ancestor rather than '.' If you've got this graph: 0-1-2 \ 3 and 3 is checked out, 2 is bookmarked with "broken", and you do "hg strip 2", the bookmark will move to 3, not 1. That's always struck me as a bug. This change makes bookmarks move to the tipmost ancestor of the stripped set rather than the currently-checked-out revision, which is what I always expected should happen.

largefiles: fix exception hack for i18n (issue3197) Properly fixing this is quite a bit trickier.

merge with crew

webcommands: do not modify repo.tagslist() Repeatedly refreshing a gitweb summary page served by hg serve would show the tags list switching between two different sequences.

tag: don't allow tagging the null revision (issue1915) Also fixed the tests that were doing this and expected it to work

i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

revset: use appropriate predicate name in error messages "extinct" and "unstable" predicates use "obsolete" implementation internally, but own predicate name should be used in error messages of them instead of "obsolete".

test-histedit-fold: fix for Windows Fixes 336121088ef1 failing with MSYS. MSYS sh.exe mangled that path by applying its path magic, which caused the test to fail on Windows.

tags: visit new heads in forward order when rebuilding cache This improves performance of building the tag cache by 4x on a repo with ~2800 heads.

identity: show trailing '+' for dirty subrepos (issue2839)

discovery: fix invalid comment about extinct being ignored

obsolete: fix decoding error message arguments

push: do not try to push remote obsolete if local has none

help: fix some instances of 'the the'

pager: work around bug in python 2.4's subprocess module (issue3533) hg v2.2.2 fixed the pager on Windows, but broke it on Python 2.4. This patch only uses the new behavior if Python >= 2.5 is detected.

clone: copy obsolete markers during local clone This change adds `obsstore` to the list of files copied by local clone, until now changesets were copied without their obsolete markers. Note: extinct changesets were and are still included by such clones to enable hardlinking. There is no obvious reason to prevent their exchange here. Rebased by Patrick Mezard <patrick@mezard.eu>

discovery: add extinct changesets to outgoing.excluded Before this change, push would incorrectly fast-path the bundle generation when extinct changesets are involved, because they are not added to outgoing.excluded. The reason to do so are related to outgoing.excluded being assumed to contain only secret changesets by scmutil.nochangesfound(), when displaying warnings like: changes found (ignored 9 secret changesets) Still, outgoing.excluded seems like a good API to report the extinct changesets instead of dedicated code and nothing in the docstring indicates it to be bound to secret changesets. This patch adds extinct changesets to outgoing.excluded and fixes scmutil.nochangesfound() to filter the excluded node list. Original version and test by Pierre-Yves.David@ens-lyon.org

convert/svn: handle non-local svn destination paths (issue3142) test-convert-svn-sink.t still pass and I tested pushing to an svn+ssh repository

setup: fix build_hgexe for mingw32 compiler Fixes python setup.py build_hgexe -i --compiler=mingw32

largefiles: fix path handling for cp/mv (issue3516) Previously, a copy or a move of a largefile only worked if the cwd was the root of the repository. The first issue was that the destination path passed to os.mkdirs() chopped the absolute path to the standin after '.hglf/', which essentially created a path relative to the repository root. Similarly, the second issue was that the source and dest paths for copyfile() were relative to the repo root. This converts these three paths to absolute paths. Some notable issues, regardless of the directory in which the cp/mv is executed: 1) The copy is not being recorded in lfdirstate, but it is in dirstate for the standins. I'm not sure if this is by design (i.e. minimal info in lfdirstate). 2) status -C doesn't behave as expected. Using the testcase as an example: # after mv + ci $ hg status -C -v --rev '.^' # expected to see 'A' and ' ' lines too R dira\dirb\largefile $ hg status -C -v --rev '.^' foo/largefile # no output # expected to see 'A' and ' ' lines only $ hg status -C -v --rev '.^' foo/ # no output # expected to see 'A', ' ' and 'R' lines $ hg status -C -v --rev '.^' ./ # expected to see 'A' and ' ' lines too R dirb\largefile $ hg status -C -v --rev '.^' ../.hglf/dira/foo/largefile A ..\.hglf\dira\foo\largefile ..\.hglf\dira\dirb\largefile # no 'R' expected when new file is specified $ hg status -C -v --rev '.^' ../.hglf # OK A ..\.hglf\dira\foo\largefile ..\.hglf\dira\dirb\largefile R ..\.hglf\dira\dirb\largefile

revset: add explanation about difference between 'filelog()' and 'file()'

hgweb: improve colors for comparison page delete: red -> red insert: green -> yellow change: yellow -> gray

histedit: fix new nodes computation with --continue (issue3534) When running the following actions: pick 617f94f13c0f 1 +4 drop 888f9082bf99 2 +5 fold 251d831eeec5 3 +6 if the fold fails, is fixed by the user with a new changeset, --continue will ignore the new revision when generating the fold changelog. This was caused by --continue detecting new changesets as descendants of the parent not descendants of changesets in the initial list. In this case, dropped changesets must be ignored. Even with the computation fixed, the 'newchildren' list was always emptied by the filtering loop and passed empty to finishfold(). Note that changesets dropped and recreated identically will still be missed. This probably cannot be solved but is unlikely to happen. Other things, like 'newchildren' having multiple heads, should be checked as well.

histedit: end folding message with an LF This is convenient when running tests dumping the editor content, it avoids the following output line to be mixed with histedit message.

merge with i18n

i18n-sv: synchronized with d1b49b02bc16

merge with crew-stable