revset: added __nonzero__ method to lazyset Now it doesn't have to go through all the set and can return lazily as soon as it finds one element.

scmutil: changed revrange to return lazysets for new style revsets When there is an old style revset or both it will still return a baseset. This may be changed in later patches.

phases: make order of debug output 'removing unknown node' deterministic

comments: fix minor spelling issues found with spell checker

hooks: for python hooks, consistently use __name__ etc as name, not the repr There is no reason to expose unnecessary Python implementation details and memory locations, also not in debug mode. readablefunc was already creating a nice name - we move that functionality up and reuse it. We consider having a __call__ and being types.FunctionType sufficiently similar and unify these two to just using the existing check for __call__.

hooks: move logging of hook name to after we have found the hook We do not expect the finding process to take a significant amount of time - it is the execution time of the hook we care about.

rebase: show nice list instead of set repr for 'computed skipped revs' debug

rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr The debug statement is already in a 'for root in roots' so it was probably the intention to show root instead of roots. Do that.

log: describe graph symbols in the help I wondered what 'x' meant and didn't find it described anywhere.

tests: backout a82de9dc4f77, debugstacktrace is now stable, drop workaround

util: debugstacktrace, flush before and after writing Close another stream (default stdout, which often is buffered) before writing to the primary stream (default stderr, which often is unbuffered). The primary stream is also flushed after writing (in case it is buffered). This fixes non-deterministic output order, especially on windows.

run-tests.py: work when --with-hg is set to system hg Previously we'd always assume that --with-hg is a script in a user directory, and would write out a 'python' symlink to the same location. That didn't work if --with-hg was set to a system installation of hg, e.g. /usr/bin/hg. Introduce a TMPBINDIR directory which is used to write out the python symlink.

revset: added cached generated list on generatorset This allows to iterate the generatorset more than once.

templater: shorten pure integers Originally, the addition of the 'shorten' template function in 9c6b86dd2ed2 would not consider pure integers for shortening. This patch considers two simple cases: when the integer starts with zero (which is parsed by Mercurial as a hash first) and when the integer is larger than the tip (obviously not a rev).

revset: fixed bug where log -f was taking too long to return

merge with stable

revset: added generatorset class with cached __contains__ method

pathencode: eliminate signed integer warnings Compiling mercurial with the Sun Studio compiler gives seven copies of the following warning on pathencode.c: line 533: warning: initializer will be sign-extended: -1 Using explicit unsigned literals silences it.

revset: changed last implementation to use lazy classes Instead of using getitem just reverse the revision list and get the first 'lim' elements. With classes like spanset which are easily reversible this will work faster. Performance Benchmarking: $ time hg log -qr "last(all())" ... real 0m0.569s user 0m0.447s sys 0m0.122s $ time ./hg log -qr "last(all())" ... real 0m0.215s user 0m0.150s sys 0m0.063s

merge with stable

help: remove last occurrences of ".. note::" without two newlines When we add two newlines after ".. note::" translators will not see this entry. And all versions of docutils interpret this paragraph correctly (details in de16c673455b).

help: add ifcontains, revset, and shortest to template help Adds help information to the template help doc. Mentions ifcontains, revset, shortest, and current in bookmarks.

verify: do not prevent verify repository containing hidden changesets Since a959f7167077, repo.cancopy() cannot be used to check if the repo is a bundlerepository. repo.url() should always have "scheme:", so it isn't necessary to parse by util.url().

hgweb: make sure sys module is loaded prior to reload hack If sys is still a demandmod, reload(sys) fails with "TypeError: reload() argument must be module".

win32: improve the performance of win32.unlink() over CIFS Emulating POSIX unlink() behavior with os.rename() and os.unlink() is often slow especially over CIFS from Windows clients due to its protocol overhead. This patch changes win32.unlink() to try first an exclusive open with the Win32 delete-on-close flag, and if a sharing violation is detected, to fall back to the original emulation. This patch also removes a test with os.path.isdir() since we expect opening a directory shall fail as os.unlink() would. Example measurements (repeated 3-times after 1-time calibration): (Without this patch: hg update from null to default) 127 files updated, 0 files merged, 0 files removed, 0 files unresolved time: real 19.871 secs (user 0.328+0.000 sys 1.794+0.000) time: real 19.622 secs (user 0.312+0.000 sys 2.044+0.000) time: real 19.138 secs (user 0.250+0.000 sys 1.872+0.000) (Without this patch: hg update from default to null) 0 files updated, 0 files merged, 127 files removed, 0 files unresolved time: real 35.158 secs (user 0.156+0.000 sys 2.512+0.000) time: real 35.272 secs (user 0.250+0.000 sys 2.512+0.000) time: real 36.569 secs (user 0.203+0.000 sys 2.387+0.000) (With this patch: hg update from null to default) 127 files updated, 0 files merged, 0 files removed, 0 files unresolved time: real 17.893 secs (user 0.328+0.000 sys 1.700+0.000) time: real 18.512 secs (user 0.265+0.000 sys 1.529+0.000) time: real 20.238 secs (user 0.312+0.000 sys 1.685+0.000) (With this patch: hg update from default to null) 0 files updated, 0 files merged, 127 files removed, 0 files unresolved time: real 12.312 secs (user 0.250+0.000 sys 0.811+0.000) time: real 12.471 secs (user 0.156+0.000 sys 0.889+0.000) time: real 9.727 secs (user 0.125+0.000 sys 0.858+0.000)

revset: changed mfunc and getset to work with old style revset methods Now extensions shouldn't break when adding new revsets.

revset: changed revsets to use spanset Performance Benchmarking: $ hg perfrevset "first(all())" ! wall 0.304936 comb 0.300000 user 0.280000 sys 0.020000 (best of 33) $ ./hg perfrevset "first(all())" ! wall 0.175640 comb 0.180000 user 0.160000 sys 0.020000 (best of 56)

revset: changed spanset to take a repo argument This way, we can have by default the length of the repo as the end argument and less code has to be aware of hidden revisions.

journal: report parsing errors on recover/rollback (issue4172)

rebase: do not try to reactivate deleted divergent bookmark If the currently active bookmark is divergent one, it may be resolved during rebase. Trying to activate it will raise "KeyError: 'W@diverge'".

tests: backout 00f2d29308db pid check

revset: changed spanset implementation to take hidden revisions into account Hidden revisions are now excluded from the spanset. Now this doesn't break for people using changeset evolution.