merge: move merge state file path into a constant We are about to change the format. Having the file path in a single place make it easier to update the filename for the new version.

revset: changed spanset __add__ implementation to work lazily $ time hg log -qr "first(0:tip or draft())" ... real 0m1.032s user 0m0.841s sys 0m0.179s $ time ./hg log -qr "first(0:tip or draft())" ... real 0m0.378s user 0m0.291s sys 0m0.085s

revset: changed lazyset __add__ implementation to work lazily Performance Benchmarking: $ time hg log -qr "first(author(mpm) or branch(default))" 0:9117c6561b0b real 0m3.875s user 0m3.818s sys 0m0.051s $ time ./hg log -qr "first(author(mpm) or branch(default))" 0:9117c6561b0b real 0m0.213s user 0m0.174s sys 0m0.038s

obsstore: add a __len__ method We can already use "for mark in store:" it make sense to allow "len(store)" too.

obsstore: `create` method return True if a marker is actually added The obsstore method now have a return value. This informs caller about the actual creation of a new markers. No new markers are created if it would have been a duplicate.

merge with crew

help: exclude deprecated extensions in the disabled part of 'help extensions'

test-help.t: add test for 'hg help extensions' This demonstrates the defect that deprecated extensions show up in the output. A followup patch will fix this defect.

ui: fix extra space in username abort

tests: fix up config --edit breakage

merge with stable

coal: hgweb style adds extra blank line in file view (issue4136) Now hgweb style='coal' adds no extra blank in file view.

pull: close peer repo on completion (issue2491) (issue2797) When pulling changes from a compressed bundle Mercurial first uncompresses it to a temporary file in .hg directory. This file will not be deleted unless the bundlerepo (other) is explicitly closed. This is similar to cleanup that occurs after incoming.

hgweb: ensure isdirectory is None for repositories, replacing any True value Until now, repositories did not provide any value for isdirectory in rows produced for the index output, and thus isdirectory was generally evaluated as None for each index entry representing a repository. However, directories (visible when viewed with the descend and collapse settings enabled) did provide a value of True and this value appeared to persist in subsequent rows processed by the templater, causing isdirectory tests in templates to produce incorrect results for index entries appearing after directories. This patch asserts the None value for repositories, thus erasing any such persistent True values.

ui: suggest config --edit when no username is set

config: add example config file when -e called with no config