merge with stable

encoding: avoid localstr when a string can be encoded losslessly (issue2763) localstr's hash method exists to prevent bogus matching on lossy local encodings. For instance, we don't want 'caf?' to match 'café' in an ASCII locale. But when café can be losslessly encoded in the local charset, we can simply use a normal string and avoid the hashing trick. This avoids using localstr's hash method, which would prevent a match between

merge with stable

revset: optimize stringset when subset == entire repo if range(len(repo)) is passed to stringset and x is a valid rev (checked before) then x is guaranteed to be in subset, we can check for that by comparing the lengths of the sets

help/revset: fix grammar

qrecord: provide help when mq is not enabled

record: improve help test coverage

paper: preserve whitespace on description instead of adding breaks This preserves the indentation of text in the changeset description. This is useful for example for descriptions containing command line use case examples like: $ hg -q heads 13934:648a834cca14 13912:71ea5b2b9517 Without this patch, such space-char indented text was just left aligned.

compact style: show bookmarks in the same manner as tags

revsets: preserve ordering with the or operator This is valuable because now revsets like 'bookmarks() or tip' will always show tip after bookmarks unless tip was itself a bookmark. This is a somewhat contrived example, but this behavior is useful for "where am I" type aliases that use log and revsets.

hgweb: set minimum number of revision to display to 1 when revcount is 0 When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).

zeroconf: clean up naked exceptions

localrepo: don't add deleted files to list of modified/added files (issue2761) If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.

path_auditor: eliminate local function 'check' in __call__

subrepo: trailing whitespace cleanup

util: move checkosfilename call from path_auditor to opener path_auditor is used for checking patterns too, but a pattern is not a valid filename. This patch fixes 98ee3dd5bab4, which introduced the bug: $ hg log -l3 glob:**.py abort: filename contains '*', which is reserved on Windows: mercurial\**.py

tests: add tests for non-existant branch/tag/bookmark

hgweb: add bookmarks listing to summary page of gitweb/monoblue styles

hgweb: remove useless notip handling from bookmarks listing

hgweb: sort bookmarks in the same manner as console command

hgweb: add bookmarks listing to raw style with test case

grep: don't print data from binary files for matches (issue2614)

color: reset win32 console color in a finally block

tests: better output on timeouts Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out".

acl: add branch tests for the current behavior of acl extension Adds simple tests for the acl.allow.branches and acl.deny.branches configuration options of the acl extension.

path_auditor: check filenames for basic platform validity (issue2755) Example (on Windows): $ hg parents $ hg manifest tip con.xml $ hg update abort: filename contains 'con', which is reserved on Windows: con.xml Before this patch, update produced (as explained in issue2755): $ hg update abort: No usable temporary filename found I've added the new function checkwinfilename to util.py and not to windows.py, so that we can later call it when running on posix platforms too, for when we decide to implement a (configurable) warning message on 'hg add'. As per this patch, checkwinfilename is currently only used when running on Windwows. path_auditor calls checkosfilename, which is a NOP on posix and an alias for checkwinfilename on Windows.

revset: rearrange code so functions are sorted alphabetically

revset: abort when tag or bookmark doesn't exist

merge with stable

subrepo: prevent url normalization from removing // in ssh paths (issue2556)

bookmarks: change error messages to match those given by 'hg tag' commands

audit: improve nested repo message

tags: remove another check for valid nodes see 1aea86673dee

revset: replace for-loop with list comprehension

subrepo: fix up svn test output

merge with stable

hgweb: fix inconsistant display of graphlog (issue1706)

hgrc.5: drop 'hgext.' prefix when talking about extensions The first paragraph apply to all extensions, not just those in hgext. The second paragraph can just use the simpler form to load mq.

merge with crew

merge with stable

merge with crew

url: use a regex to hide unsupported ssh passwords (issue2754)

commit: note when files are missing Before, you could experience the following strange interaction: $ hg commit nothing changed $ hg merge abort: outstanding uncommitted changes which confused at least one user in #mercurial.

relink: correct unusual indentation

hg: make parseurl() consistently return normalised path Before this the path was only normalised when a fragment was used.

bugzilla: more documentation formatting fixups Correct typo in numbering list of access methods. Convert a section reference and a template parameter reference into literal text, for consistency with other use.

merge with stable

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

tags: no need to check for valid nodes _findtags in localrepo checks that nodes exist in the revlog so we can't get a LookupError here. The output of 'hg tags' stays the same since tags to unknown nodes didn't get printed before anyway due to ae3089cefaab.

localrepo: ignore tags to unknown nodes (issue2750)

merge: added info that hg help merge-tools shows the options for --tool

util: move checklink() to posix.py and return False on Windows Python added support for Windows 6.0 (Vista) symbolic links in 3.2 [1], but even these symbolic links aren't what we can expect from a canonical symbolic link, since creation requires SeCreateSymbolicLinkPrivilege, which typically only admins have. So we can safely assume that we don't have symbolic links on Windows. [1] http://docs.python.org/py3k/library/os.html#os.symlink

util: make 'hg log -d --2' abort (issue2734)

help: sort help topics to make the output more readable (issue2751)

merge with stable

help/dates: use DATE as place-holder in help and abort texts The use of "{datetime}" was unfortunate since I as a user never knew if I was expected to do hg log -d '>{2011-04-01}' or hg log -d '>2011-04-01' The word "datetime" is also confusing -- calling it a date it much simpler.

keyword: convert a verbatim block to a field list

bugzilla: convert a verbatim block to a field list

bugzilla: fix reST error introduced in 22d200e49b10 All blocks must be indented. Here we can use a field list instead of a verbatim block for a real list layout.

help/dates: rephrase explanation of internal format The old explanation referred to the two numbers as "unixtime" and "offset" without really defining those terms.

rebase: drop ancestor import

rebase: drop unused p2 arg from rebasenode

util: move checkexec() to posix.py and return False on Windows

misc: replace .parents()[0] with p1()