Kostia Balytskyi <ikostia@fb.com> [Wed, 09 Mar 2016 08:08:27 -0800] rev 28429
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.
Yuya Nishihara <yuya@tcha.org> [Wed, 09 Mar 2016 23:57:15 +0900] rev 28428
graphlog: bring back color to node symbol template
Follows up 3356bf61fa25. A ui object is required to render labels.
Yuya Nishihara <yuya@tcha.org> [Tue, 16 Feb 2016 21:44:13 +0900] rev 28427
revset: add inspection data to max() and min() functions
We are likely to be interested in how these functions build a result set.
Yuya Nishihara <yuya@tcha.org> [Tue, 16 Feb 2016 21:43:51 +0900] rev 28426
revset: add inspection data to limit() and last() functions
We are likely to be interested in how these functions calculate a result set.
Yuya Nishihara <yuya@tcha.org> [Tue, 16 Feb 2016 21:32:00 +0900] rev 28425
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.
Yuya Nishihara <yuya@tcha.org> [Sat, 13 Feb 2016 20:05:57 +0900] rev 28424
revset: add inspection data to all filter() calls
This is useful for debugging revset construction.
Yuya Nishihara <yuya@tcha.org> [Sat, 13 Feb 2016 19:25:11 +0900] rev 28423
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