windows: eliminate win32 wildcard import

merge with stable

merge with crew

test-filecache: change for python 2.4 compatibility

setdiscovery: return anyincoming=False when remote's only head is nullid This fixes (issue2907) a crash when using 'hg incoming --bundle' with an empty remote repo and a non-empty local repo. This also fixes an unreported bug that 'hg summary --remote' erroneously reports incoming changes when the remote repo is empty and the local is not. Also, add a test to make sure issue2907 stays fixed

i18n: use UTF-8 string to lower filename for case collision check Some character sets, cp932 (known as Shift-JIS for Japanese) for example, use 0x41('A') - 0x5A('Z') and 0x61('a') - 0x7A('z') as second or later character. In such character set, case collision checking recognizes different files as CASEFOLDED same file, if filenames are treated as byte sequence. win32mbcs extension is not appropriate to handle this problem, because this problem can occur on other than Windows platform only if problematic character set is used. Callers of util.checkcase() use known ASCII filenames as last component of path, and string.lower() is not applied to directory part of path. So, util.checkcase() is kept intact, even though it applies string.lower() to filenames.

merge with crew

check-code: disallow use of hasattr() The hasattr() builtin from Python < 3.2 [1] has slightly surprising behavior: it catches all exceptions, even KeyboardInterrupt. This causes it to have several surprising side effects, such as hiding warnings that occur during attribute load and causing mysterious failure modes when ^Cing an application. In later versions of Python 2.x [0], exception classes which do not inherit from Exception (such as SystemExit and KeyboardInterrupt) are not caught, but other types of exceptions may still silently cause returning False instead of getting a reasonable exception. [0] http://bugs.python.org/issue2196 [1] http://docs.python.org/dev/whatsnew/3.2.html

demandimport: use getattr instead of hasattr We don't use util.safehasattr() here to avoid adding new dependencies for demandimport. This change may expose previously-silenced deprecation warnings to appear, as hasattr silently hides warnings that occur during module import when using demandimport.

demandimport: blacklist rfc822 and mimetools to prevent spurious warnings

i18n: use getattr instead of hasattr Using getattr instead of util.safehasattr here to avoid adding another dependency for i18n.

win32/hgwebdir_wsgi: use getattr instead of hasattr

setup.py: use getattr instead of hasdattr

setup3k: use getattr instead of hasattr Note that hasattr is fixed on Python 3, so this is more about being concise and keeping check-code happy than actual correctness of code.

tests: use getattr instead of hasattr

wireproto: use safehasattr or getattr instead of hasattr

windows: use getattr instead of hasattr

util: use safehasattr or getattr instead of hasattr

templatefilters: use safehasattr instead of hasattr

patch: use safehasattr instead of hasattr

mail: use safehasattr instead of hasattr

url: replace uses of hasattr with safehasattr or getattr

subrepo: use safehasattr instead of hasattr Some of these instances could be rewritten as clever getattr(x, y, default) ladders, but that felt like it impeded readability too much to be worth the modest efficiency gain.

statichttprepo: replace hasattr with getattr

walkrepos: use getattr instead of hasattr for samestat

revlog: use getattr instead of hasattr

lsprof: use getattr instead of hasattr

keepalive: use safehasattr instead of hasattr

hgweb: move remaining hasattr calls to safehasattr

wsgicgi: use getattr instead of hasattr

httprepo: use getattr instead of hasattr

help command: use safehasattr instead of hasattr

hgweb_mod: use safehasattr instead of hasattr

hg: use safehasattr instead of hasattr

encoding: use getattr isntead of hasattr

dispatch: use safehasattr instead of hasattr

debugignore: use getattr instead of hasattr

cmdutil: use safehasattr instead of hasattr

byterange: replace uses of hasattr with getattr

bookmarks: use getattr instead of hasattr

hgext: replace uses of hasattr with util.safehasattr

globally: use safehasattr(x, '__iter__') instead of hasattr(x, '__iter__')

globally: use safehasattr(x, '__call__') instead of hasattr(x, '__call__')

safehasattr: new function to work around hasattr being broken

windows: check util.mainfrozen() instead of ad-hoc checks everywhere

notify: rewrite user documentation The main intent is to turn the reference help into a configuration walkthrough. It also fix several things: - Do not suggest to use it for commit notifications, it cannot work - Fix notify.strip default value - Mention that subscriptions can be setup in Mercurial configuration files - Improve notify.strip and notify.domain documentation

cmdserver: repo.invalidate() on every runcommand This will trigger the filecache and recreate every cached property that was changed by something other than this cmdserver instance (e.g. by running 'hg commit' at the cmdline).

help: add "web/logoimg" setting description

filecache: fix check-code complaint

localrepo: unify tag related info into a tagscache class

localrepo: make invalidate() walk _filecache

localrepo: decorate manifest() with filecache

localrepo: decorate _bookmarks/current with filecache nodebookmarks() can be cached as well, leaving for later

localrepo: decorate changelog() with filecache

localrepo: refresh filecache entries after releasing a repo.lock()

localrepo: decorate dirstate() with filecache We refresh the stat info when releasing repo.wlock(), right after writing it. Also, invalidate the dirstate by deleting its attribute. This will force a stat by the decorator that actually checks if anything changed, rather than reading it again every time. Note that prior to this, there was a single dirstate instance created for a localrepo. It was invalidated by calling dirstate.invalidated(), clearing its internal attributes. As a consequence, the following construct is no longer safe: ds = repo.dirstate # keep a reference to the repo's dirstate wlock = repo.wlock() try: ds.setparents(...) finally: wlock.release() # dirstate should be written here Since it's possible that the dirstate was modified between lines #1 and #2, therefore changes to the old dirstate won't get written when the lock releases, because a new instance was created by the decorator.

localrepo: add a cache with stat info for files under .hg/

scmutil: introduce filecache The idea is being able to associate a file with a property, and watch that file stat info for modifications when we decide it's important for it to be up-to-date. Once it changes, we recreate the object. On filesystems that can't uniquely identify a file, we always recreate. As a consequence, localrepo.invalidate() will become much less expensive in the case where nothing changed on-disk.

posix, windows: introduce cachestat This class contains a stat result, and possibly other file info to reliably determine between two points in time whether a file has changed. Uniquely identifying a file gives us that reliability because we either atomic rename or append. So one of two will happen: the file 'id' will change, or the size of the file will change. posix implements it simply by calling os.stat() and checking if the result has st_ino. For now on Windows we always assume the path is uncacheable. This can be improved on NTFS due to file IDs: http://msdn.microsoft.com/en-us/library/aa363788(v=vs.85).aspx So we need to find out if a file path is on an NTFS drive, for that we have: - GetVolumeInformation, which unfortunately only works with a root path (but is available on XP) - GetVolumeInformationByHandleW, works on a full file path but requires Vista or higher

util: eliminate wildcard imports

templater: use a global funcs table

ui: config path relative to repo root

ui: providing no default value to configpath should not raise an Error

ui: fix error, base can not be a list

merge with stable

test-i18n, i18n-pt_BR: updated test message changed in 41c3a71c318d

i18n-pt_BR: synchronized with a934b9249574

merge with stable

rebase: remove trailing whitespace found by check-code

hooks: use python 2.4 compatible exception handling

url: handle urls of the form file:///c:/foo/bar/ correctly

dispatch: avoid double backslashes in error message The use of %r in the format string caused Python to display Windows paths with double backslashes.

hgweb: add a "web/logoimg" setting to customize the web logo image This change complements the existing web/logourl setting, and lets the user customize the logo image that is shown on many of the hg server pages. If this setting is not set, hglogo.png is used.

util: move windows and posix wildcard imports to begin of file

util: move "default" hidewindow to posix.py There is a hidewindow in win32.py, which we get via windows.py

util: move "default" lookupreg to posix.py There is a lookupreg in win32.py, which we get via windows.py

util: move "default" unlinkpath to posix.py we have a unlinkpath in windows.py

util: move "default" makedir to posix.py makedir is already defined in win32.py, which gets imported into util.py via windows.py if we are running on Windows

summary: allow color to highlight active bookmark

summary: show bookmarks separate from tags and note active mark (issue2892)

localrepo: make requirements attribute of newly-created repos contain a set This is for internal consistency, as this attribute typically contains a set

localrepo: fix comment on set

revert: restore check for uncommitted merge (issue2915) (BC) This will restore the pre-1.9 behavior.

localrepo: add set method to iterate over a given revset This should allow replacing a number of hand-rolled graph algorithms.

revset: add formatspec convenience query builder

revset: allow bypassing alias expansion For internal usage of revset queries, we don't want aliases breaking things.

merge with stable

subrepo: don't commit in subrepo if it's clean If a subrepo has changed relative to the outer repo's substate, but the subrepo itself is clean, we don't need to commit in the subrepo.

rebase: block collapse with keepbranches on multiple named branches (issue2112) Collapse and keepbranches should be blocked when there is more than one named branch on the branch that's going to be rebased.

merge with stable

hbisect: do not assume that min(good) is an ancestor of min(bad) The included test used to report "inconsistent state", which is incorrect. While this situation cannot occur when the user sticks to the suggested bisect sequence. However, adding more consistent good/bad information to the bisect state should be tolerated as well.

hbisect: more consistent variable name

hbisect: confine loop to the relevant interval In this context we know that ancestors[rev] == None for all rev <= goodrev, so looping further back is unnecessary (and confusing).

win32: assign winstdout to sys.__stdout__ as well (issue2888) On Windows sys.stdout was being replaced with winstdout, which caused util.system() to redirect its output (due to 406b6d7bdcb9). That causes interactive tools (such as vim) to stop working.

alias: note interaction of shell aliases with early opts in help

alias: fix up test results