export: add help examples

diff: add help examples

archive: add help examples

test-rollback: tinker a bit to make it easier to add more tests.

convert: added bookmarks support in filemap When using the convert extension from a Mercurial rep. to subset it with filemap, the bookmarks are not copied. I fixed this by calling the base.get_bookmarks() from the filemap getbookmarks() instead of returning an empty dictionary. It should work also for other converters that implement getbookmarks() (like git). I don't see any drawbacks except that the bookmarks are always copied (not necessarily wanted all the times).

util: fix finding of hgexecutable The version introduced in 89d9f92f6fdd would for example return thg (thanks to Mads Kiilerich for pointing to this)

log: add a usage note about --removed

log: rearrange the help text a bit

log: add some usage examples to verbose help

minirst: fix container stripping logic

share: allow trailing newline on .hg/sharedpath. This is extremely handy for those occasional circumstances where you need to edit .hg/sharedpath manually, since modern Unix text editors make it surprisingly difficult to create a text file with no trailing newline.

contrib: some support for named branches in zsh_completion (issue2988) named branches were not included for autocompletion in zsh. by adding _hg_branches and calling it from _hg_labels, named branches are now included when autocompleting many commands in zsh. support for completion of hg log -b was also added. there are possibly other cases where support needs to be explicitly added.

test: test for options duplicate with global options issue2995 should not happen anymore

merge with stable

rollback: improve readability; clarify that the return value is an int.

demandimport: determine at load time if __import__ has level argument

win32: quietly ignore missing CreateHardLinkA for Wine

osutil: avoid accidentally destroying the True object in isgui (issue2937) Needed to use 'Py_RETURN_TRUE' instead of 'return Py_True' to avoid reference count errors which would randomly crash the Python executable during merge. This only happened when you had something configured in merge-tools and the merge was large enough.

merge with stable

merge

bundlerepo: add argument check before unlink The default argument value of None, for bundlename, would cause an exception. Callers currently pass an empty string, thus dodging this problem.

test-setdiscovery: allow for leading space in output of wc

merge with stable

ui: write traceback to self.ferr

mq: split up overly long line

patch: handle 'gitpatches' being empty, but not none

mq: don't suppress patch tracebacks when applying patches

test-setdiscovery.t: portability fix The output of 'wc -c' is prefixed with spaces when using BSD wc.

keyword: use wopener(..., atomictemp=True) to overwrite

share: drop unused import

merge with stable

test: test unshare command

hgext: introduce unshare command

hg: extract copying the store out of clone

url: Remove the proxy env variables only when needed (issue2451) This is an attempt to fix issue 2451 and its duplicates (2599 and 2949, AFAIK). Its main idea is that it is only necessary to clean the proxy environment variables *when* http_proxy is set in the config file (since it takes precedence over the environment variables). Otherwise, hg shouldn't bother with them, since they will most likely be used to reach the server.

util: improve finding of hgexecutable check the module __main__ before looking on the default path

keyword: make status test after record and kwexpand/kwshrink reliable This guarantees test failure when the dirstate code is omitted at the end of the kwtemplater.overwrite method. kwexpand/kwshrink: Without a 1 second wait the test succeeds sometimes, even when the dirstate of the overwritten file is not forced to normal. record: status after recording an added file allows to check whether normallookup is needed after overwriting.

url: parse fragments first (issue2997)

log: remove -h short option for --hidden (issue2995)

merge with stable

hgweb: properly check for bookmarks when drawing graph

keyword: preserve file mode when overwriting

convert: use repo.join instead of referencing ".hg" directly

repair: switch from changegroupsubset to getbundle This is in preparation of deprecating changegroupsubset.

merge with stable

i18n: calculate terminal columns by width information of each characters neither number of 'bytes' in any encoding nor 'characters' is appropriate to calculate terminal columns for specified string. this patch modifies MBTextWrapper for: - overriding '_wrap_chunks()' to make it use not built-in 'len()' but 'encoding.colwidth()' for columns of string - fixing '_cutdown()' to make it use 'encoding.colwidth()' instead of local, similar but incorrect implementation this patch also modifies 'encoding.py': - dividing 'colwith()' into 2 pieces: one for calculation columns of specified UNICODE string, and another for rest part of original one. the former is used from MBTextWrapper in 'util.py'. - preventing 'colwidth()' from evaluating HGENCODINGAMBIGUOUS configuration per each invocation: 'unicodedata.east_asian_width' checking is kept intact for reducing startup cost.

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.

encoding: use getattr isntead of hasattr

setdiscovery: fix hang when #heads>200 (issue2971) When setting up the next sample, we always add all of the heads, regardless of the desired max sample size. But if the number of heads exceeds this size, then we don't add any more nodes from the still undecided set. (This is debatable per se, and I'll investigate it, but it's how we designed it at the moment.) The bug was that we always added the overall heads, not the heads of the remaining undecided set. Thus, if #heads>200 (desired sample size), we did not make progress any longer.

ui: also swap sys.stdout with self.fout in _readline In 17ffb30d9174, _readline was changed to output a space using raw_input and this was done using sys.stdout directly, not self.fout. This change broke the command server for JavaHg since it (and other clients) would see a spurious ' ' on stdout and interpret this as an unknown channel.

merge with stable

Added signature for changeset d629f1e89021

Added tag 1.9.2 for changeset d629f1e89021

util: postpone and reorder parent calculation in makedirs

atomictempfile: make close() consistent with other file-like objects. The usual contract is that close() makes your writes permanent, so atomictempfile's use of close() to *discard* writes (and rename() to keep them) is rather unexpected. Thus, change it so close() makes things permanent and add a new discard() method to throw them away. discard() is only used internally, in __del__(), to ensure that writes are discarded when an atomictempfile object goes out of scope. I audited mercurial.*, hgext.*, and ~80 third-party extensions, and found no one using the existing semantics of close() to discard writes, so this should be safe.

posix: check for executable bits on files identified by findexe function

subrepo: fix cloning of repos from urls without slash after host (issue2970) This fixes a regression introduced with the new url handling in 1.9. This should perhaps be fixed in the url class instead, but that might be too invasive for a stable bugfix.

merge with stable

ui: pass ' ' to raw_input when prompting This is a workaround for calling ui.prompt(...), typing some character then hitting backspace which causes the entire line to delete rather than just the one character. This was seen on Debian using gnome-terminal. (credits to Mads for the idea) Python bug can be found here: http://bugs.python.org/issue12833

dagutil: fix off-by-one in inverserevlogdag buildup

i18n-pt_BR: synchronized with 7f504202cb5c

util.makedirs: make recursion simpler and more stable (issue2948) Before, makedirs could call itself recursively with the same path name it was given, relying on sane file system behavior to terminate the recursion. That could cause infinite recursion on insane file systems. Instead we now call mkdir explicitly after having created parent directory recursively. Exceptions from this mkdir is not swallowed.

util.makedirs: propagate chmod exceptions The existing exception handling was intended to handle mkdir errors. Strange chmod exceptions could thus have strange consequences - or be swallowed.

color: add styles for tags

ui: use labels when outputting tags

merge with stable

help/config: strip trailing whitespace This disabled paragraph splitting for translations.

commands: clarify that 'hg heads foo' shows heads on branch foo This is a FAQ: people try 'hg heads -r foo' and only see the tip-most branch heads on foo.

merge with stable

commands: fix grammar in resolve help text

merge: use repo.ui directly instead local variable The non-standard 'u = repo.ui' shorthand was only used two times and there were many other full references to repo.ui.

win32: msvcr71.dll should be used for python 2.4 and 2.5 Following is list of C-Runtime for versions of CPython on windows: - python 2.4.5 => MSVCR71.dll - python 2.5.4 => MSVCR71.dll - python 2.6.6 => MSVCR90.dll - python 2.7 => MSVCR90.dll - python 3.1.2 => MSVCR90.dll

minirst: add a helper function to build an RST table from an array

minirst: drop debug code This standalone mode no longer works due to the mechanics of import and util. When run not as part of a package, the import of util causes an import of the built-in posix module, which doesn't contain the expected symbols. This is difficult to fix in Py2.4.

minirst: add simple table support This adds a subset of the 'simple table' support from RST to allow formatting of options lists through RST. Table columns are automatically sized based on contents, with line wrapping in the last column.

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.