templater: make _hybrid not callable to avoid conflicting semantics In templater, a callable symbol exists for lazy evaluation, which should have f(**mapping) signature. On the other hand, _hybrid.__call__(), which was introduced by 0b241d7a8c62, generates mapping for each element. This patch renames _hybrid.__call__() to _hybrid.itermaps() so that a _hybrid object can be a value of a mapping dict. {namespaces % "{namespace}: {names % "{name }"}\n"} ~~~~~ a _hybrid object

backout: commit changeset by default (BC) Add --no-commit flag to prevent it. This should make the hg user experience a little better. Some discussion can be found here: http://markmail.org/message/7jm7ro2ias6hxywy

help: move Windows 9x information to appropriate place

shelve: move commitfunc closer to use site Supporting shelving of unknown files needs this code motion. No functional changes.

commands: document clone bundles hooks and rollback behavior The added content is inside a verbose container. I figure it makes sense to explicitly document behavior, including with the caveat it may change later. People can't say they weren't warned!

clonebundles: improve BUNDLESPEC documentation Before the existence of `hg debugbundle --spec`, the process for defining the BUNDLESPEC value in manifests was not very clear and not trivial to automate, especially in the case of stream clone bundles. This patch adds documentation to note the existence of `hg debugbundle --spec`. We drop the reference to stream clone requirements handling because it is now redundant with `hg debugbundle --spec`. While we are here, we further reinforce the importance of defining BUNDLESPEC.

commands: teach debugbundle to print bundle specification This seems like the most logical place to put this functionality. Test coverage over existing known bundle specs has been added.

commands: use context manager for opened bundle file

exchange: implement function for inferring bundle specification We don't currently have a mechanism for inferring bundle spec strings from bundle files. This patch adds one. This will eventually be used to make the producing of clone bundles manifests easier.

streamclone: extract code for reading header fields So it can be called from another consumer in a future patch.

encoding: escape U+007F (DEL) character in JSON RFC 7159 does not state that U+007F must be escaped, but it is widely considered a control character. As '\x7f' is invisible on a terminal, and Python's json.dumps() escapes '\x7f', let's do the same.

run-tests: skip threading for a single test (issue5040) This version backs out 50e621fe0362 and implements it in a more consistent manner.

cleanup: use modern @property/@foo.setter property specification We can use this now that we're 2.6+, and this is more idiomatic modern Python.

buildrpm: use bash shebang, since we use bash features in the script As suggested by Bryan O'Sullivan.

mac: ignore resource fork when checking file sizes Some evil evil awful tool adds resource forks to files it's comparing. Our Mac-specific code to do bulk stats was accidentally using "total size" which includes those forks in the file size, causing them to be reported as modified. This changes it to only care about the normal data size and thus agree with what Mercurial's expecting.

copies: fix detection of divergent directory renames If we move all the files out of one directory, but into two different directories, we should not consider it a directory rename. The detection of this case was broken.

with: use context manager for transaction in strip

with: use context manager for transaction in pushphase

with: use context manager for transaction in strip

with: use a context manager for transaction in strip

with: use context manager in rebuildfncache

with: use context manager for transaction in consumev1

with: use context manager in _histedit

with: use context manager in amend

with: use context manager for transaction in changegroup apply (This needs some line wrapping due to the additional indent level. -mpm)

with: use context manager for transaction in rebase

with: use context manager for transaction in qimport

with: use context manager for transaction in qfinish

with: use context manager for transaction in mercurial_sink

transaction: turn a transaction into a Python context manager This lets us greatly simply acquire/release cycles. If the block completes without raising an exception, the transaction is closed. Code pattern before: try: tr = repo.transaction('x') # zillions of lines of code tr.close() finally: tr.release() And after: with tr.transaction('x'): # ...

with: use context manager for lock in pushphase

with: use context manager in rebuildfncache again

with: use context manager in streamclone consumev1

with: use context manager in manifest

with: use context manager in rename

with: use context manager in resolve

with: use context manager in unbundle

with: use context manager in update

with: use context manager in bisect save_state

with: use context manager in merge update

with: use context manager in _markchanges

with: use context manager in maybeperformlegacystreamclone

with: use context manager in verify

with: use context manager in qrename

with: use context manager in qfinish

with: use context manager in localrepo recover

with: use context manager in streamclone generatev1

with: use context manager in subrepo storeclean

with: use context manager in subrepo _cachestorehash

with: use context manager in largefiles commit

with: use context manager in unshelveabort

with: use context manager for wlock in transplant

with: use context manager for wlock in shelve stripcmd

with: use context manager for lock in continue

with: use context manager for wlock in unshelve

with: use context manager for wlock in shelve deletecmd

with: use context manager for wlock in shelve cleanupcmd

with: use context manager for wlock in shelve createcmd

with: use context manager for lock in histedit cleanupnode

with: use context manager for lock in qimport