rebase: turn rebaseskipobsolete on by default Consider the following use case. User has a set of commits he wants to rebase onto some destination. Some of the commits in the set are already rebased and their new versions are now among the ancestors of destination. Traditional rebase behavior would make the rebase and effectively try to apply older versions of these commits on top of newer versions, like this: a` --> b --> a` (where both 'a`' and 'a``' are rebased versions of 'a') This is not desired since 'b' might have made changes to 'a`' which can now result in merge conflicts. We can avoid these merge conflicts since we know that 'a``' is an older version of 'a`', so we don't even need to put it on top of 'b'. Rebaseskipobsolete allows us to do exactly that. Another undesired effect of a pure rebase is that now 'a`' and 'a``' are both successors to 'a' which is a divergence. We don't want that and not rebasing 'a' the second time allows to avoid it. This was not enabled by default initially because we wanted to have some more experience with it. After months of painless usages in multiple places, we are confident enough to turn it on my default.

graphlog: bring back color to node symbol template Follows up 3356bf61fa25. A ui object is required to render labels.

revset: add inspection data to max() and min() functions We are likely to be interested in how these functions build a result set.

revset: add inspection data to limit() and last() functions We are likely to be interested in how these functions calculate a result set.

revset: stub to add extra data to baseset for better inspection We sometimes construct a baseset from filtering result. In that case, a baseset can provide more precise information how it is constructed.

revset: add inspection data to all filter() calls This is useful for debugging revset construction.

revset: add extra data to filteredset for better inspection A filteredset is heavily used, but it cannot provide a printable information how given set is filtered because a condition is an arbitrary callable object. This patch adds an optional "condrepr" object that is used only by repr(). To minimize the maintaining/runtime overhead of "condrepr", its type is overloaded as follows: type example -------- --------------------------------- tuple ('<not %r>', other) str '<branch closed>' callable lambda: '<branch %r>' % sorted(b) object other

zeroconf: replace reduce+add with itertools.chain

zeroconf: replace has_key with in

zeroconf: compare singleton using is

zeroconf: remove camelcase in identifiers

setup: switch to with open as We're leaving the modulepolicy bit alone, because it's being rewritten in the next commit.

win32mbcs: use absolute_import

notify: use absolute_import

patchbomb: use absolute_import

convert: __init__ use absolute_import

convert: cvs use absolute_import

convert: transport use absolute_import

convert: bzr use absolute_import

convert: common use absolute_import

convert: convcmd use absolute_import

convert: subversion use absolute_import

blackbox: guard against recursion from dirty check

tests: divorce blackbox test from test-dispatch.py I used test-dispatch.py to demonstrate what would happen if a log file changed from being readonly to writable, by having it replace a directory (proxy for readonly/not-writable) with a log file in between transactions of a running python process (proxy for Mercurial). This commit makes it easier for people to follow what the test is doing, by creating a real file that people can read.

tests: test-dispatch use print_function

tests: test-dispatch use absolute_import

templater: ignore orig/rej files If your mercurial/templates/ directory is dirty, then the template system would otherwise import duplicate templates from the .orig files and potentially try to parse .rej files. Since editing/reverting these templates isn't an unexpected action, and since they're in .hgignore, it's best that the template system know to skip them."

resolve: when pats do not match, hint about path: Suggest a command that would probably work.

shelve: changes getting opts values by get method When shelve is used by another extension that doesn't provide all necessary values in opts shelve raises KeyError exception. This patch fixes this by getting values from opts dictionary with get method.

contrib: remove references to 2to3 The custom porting fixers are removed. A comment related to 2to3 has been removed from the import checker. After this patch, no references to 2to3 remain.