minirst: only strip leading newlines, not indentation

ui: allow alternatives for config options

merge with stable

parsers: avoid pointer aliasing Newer versions of GCC have aggressive pointer alias optimizations that might get fooled by our pointer manipulations. These issues shouldn't be encountered in practice because distutils compiles extensions with -fno-strict-alias but the code was not valid according to the standard.

graphlog: attempt to fix index overrun (issue2912) This bug may be caused by file subgraphs have more than two parents per node. I have no idea if this fix is correct as the graphlog code is mysterious, but it seems to be fine on the available test case.

util: wrap lines with multi-byte characters correctly (issue2943) This re-introduces the unicode conversion what was lost in d320e70442a5 5 years ago and had the comment: To avoid corrupting multi-byte characters in line, we must wrap a Unicode string instead of a bytestring.

keyword: avoid x = a and b or c

match: remove unused assignment The field is assigned again below with the constructor argument.

http: explain why the host is passed to urllib2 password manager The original comment was in url.getauthinfo() and was lost in bf6156bab41b.

merge with stable

test-http: test http authentication The extension hack is based on Henrik Stuart's hg-textauth.

http: pass user to readauthforuri() (fix 4a43e23b8c55) urllib2 never handles URIs with credentials, we have to extract them and store them in the password manager before handing the stripped URI. Half of the changes deducing the username from the URI in 4a43e23b8c55 were incorrect. Instead, we retrieve the username from the password manager before passing to readauthforuri(). test-hgweb-auth.py was passing because the test itself was flawed: it was passing URIs with credentials to find_password(), which never happens.

http: strip credentials from urllib2 manager URIs (issue2885) urllib2 password manager does not strip credentials from URIs registered with add_password() and compare them with stripped URIs in find_password(). Remove credentials from URIs returned by util.url.authinfo(). It sometimes works when no port was specified as the URI host is registered too.

help: move option text display into a helper function

help: move 'additional help topics' code

help: rename option_lists to optlist

help: drop with_version If --version is specified, we print the version and exit (as documented).

dispatch: don't rewrap aliases that have the same definition Previously aliases that overrode existing commands would wrap the old alias on every call to dispatch() (twice actually), which is an obvious re-entrancy issue for things like the command server or TortoiseHG.

url: really handle urls of the form file:///c:/foo/bar/ correctly 28edd65000d9 made sure that paths that seemed to start with a windows drive letter would not get an extra leading slash. localpath should thus not try to handle this case by removing a leading slash, and this special handling is thus removed. (The localpath handling of this case was wrong anyway, because paths that look like they start with a windows drive letter can't have a leading slash.) A quick verification of this is to run 'hg id file:///c:/foo/bar/'.

wireproto: add out-of-band error class to allow remote repo to report errors Older clients will still print the provided error message and not much else: over ssh, this will be each line prefixed with 'remote: ' in addition to an "abort: unexpected response: '\n'"; over http, this will be the '---%<---' banners in addition to the 'does not appear to be a repository' message. Currently, clients with this patch will display 'abort: remote error:\n' and the provided error text, but it is trivial to style the error text however is deemed appropriate.

windows: fix pyflakes warning on unused imports This is ugly, but only marginally uglier than before, and it avoids hacking/disabling our pyflakes test

minirst: add decorateblocks search helper

minirst: add getsections helper

minirst: add formatblocks helper

minirst: add parse method to get document structure

util: move copymode into posix.py and windows.py reducing it to a NOP on Windows. This eliminates a pointless stat call on Windows and reduces the risk of interferring with other processes (e.g. AV-scanners, file change watchers). See also http://mercurial.selenic.com/wiki/UnlinkingFilesOnWindows, item 2d

util: factor new function copymode out of mktempcopy

revert: introduce short option -C for --no-backup Corresponds to -C of the update command. It's much more convenient to use: $ hg revert -aC than having to type $ hg revert -a --no-backup I think the 'no-backup' case is a frequent use case. Introducing short option -C here fits with the muscle memory we have from 'hg update -C', which is described there as "discard uncommitted changes (no backup)".

merge with stable

Added signature for changeset 4a43e23b8c55

Added tag 1.9.1 for changeset 4a43e23b8c55

hgweb: do not ignore [auth] if url has a username (issue2822) The [auth] section was ignored when handling URLs like: http://user@example.com/foo Instead, we look in [auth] for an entry matching the URL and supplied user name. Entries without username can match URL with a username. Prefix length ties are resolved in favor of entries matching the username. With: foo.prefix = http://example.org foo.username = user foo.password = password bar.prefix = http://example.org/bar and the input URL: http://user@example.org/bar the 'bar' entry will be selected because of prefix length, therefore prompting for a password. This behaviour ensure that entries selection is consistent when looking for credentials or for certificates, and that certificates can be picked even if their entries do no define usernames while the URL does. Additionally, entries without a username matched against a username are returned as if they did have requested username set to avoid prompting again for a username if the password is not set. v2: reparse the URL in readauthforuri() to handle HTTP and HTTPS similarly. v3: allow unset usernames to match URL usernames to pick certificates. Resolve prefix length ties in favor of entries with usernames.

hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923) Before: hgweb made it possible to download file content with a content type detected from the file extension. It would serve .html files as text/html and could thus cause XSS vulnerabilities if the web site had any kind of session authorization and the repository content wasn't fully trusted. Now: all files default to "application/binary", which all important browsers will refuse to treat as text/html. See the table here: https://code.google.com/p/browsersec/wiki/Part2#Survey_of_content_sniffing_behaviors

hgweb: extract the path logic from updatereqenv and add doctests

merge with stable

hgweb: handle 'baseurl' configurations with leading slash (issue2934)

ui: call write() so the prompt string goes through subclassed implementation

merge with stable

merge with i18n

i18n-ja: synchronized with 4fdab926e111

i18n-sv: synchronized with 192e02680d09

parsers: remove redundant 'n' variable in parsers.parse_index2() (issue2935)

subrepo: handle adding svn subrepo with a svn:external file in it (issue2931)

hook: be prepared for __stdout/err__ not having fileno() it may have been replaced, see https://bitbucket.org/tortoisehg/thg/issue/937

dispatch: make sure global options on the command line take precedence So if a user has verbose=True somewhere in his .hgrc files, giving -q on the command line will override that. This basically reverts 1b8c70c9f47c.

http2: send an extra header to signal a non-broken client Some proxies strip the expect header because they forward requests in a non-compliant way or as a way to defend against bogus clients.

httpclient: import ca33b88d143c from py-nonblocking-http (issue2932)

color.py - clear _terminfo_params in win32 mode

url: store and assume the query part of an url is in escaped form (issue2921)

mq/qqueue: print current queue name Add an option to qqueue to print only the name of the current queue. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

export: add %m to file format string (first line of the commit message) $ hg commit -m "Initial commit" $ hg export -o %m.patch tip #It creates Initial_commit.patch file.

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