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