Yuya Nishihara <yuya@tcha.org> [Thu, 10 Sep 2015 23:32:36 +0900] rev 26233
fileset: handle error of string unescaping
Yuya Nishihara <yuya@tcha.org> [Thu, 10 Sep 2015 23:29:55 +0900] rev 26232
revset: handle error of string unescaping
Yuya Nishihara <yuya@tcha.org> [Thu, 10 Sep 2015 23:25:10 +0900] rev 26231
parser: move unescape helper from templater
revset and fileset have a similar problem, so let's make it a common helper
function.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 10 Sep 2015 16:14:39 -0700] rev 26230
unionrepo: take delta base in account with building unified revlog
When general delta is enabled, the base is actually meaningful and should be
used. With general delta is enabled, test-unionrepo.t crash without this fix.
Matt Harbison <matt_harbison@yahoo.com> [Wed, 09 Sep 2015 22:27:48 -0400] rev 26229
extdiff: enable -I/-X with --patch
Not sure how useful this really is, but it's trivial to add and ignoring the
existing arguments supported seems like a bad UI.
Matt Harbison <matt_harbison@yahoo.com> [Wed, 09 Sep 2015 21:07:38 -0400] rev 26228
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
Matt Harbison <matt_harbison@yahoo.com> [Wed, 09 Sep 2015 20:48:09 -0400] rev 26227
extdiff: prepare sections of dodiff() for conditionalizing
This is purely indenting under an unconditional branch, so that the actual
changes in the next patch are clear. Feel free to fold them if desired.
Matt Mackall <mpm@selenic.com> [Fri, 11 Sep 2015 12:48:09 -0700] rev 26226
hgweb: drop unused import
Augie Fackler <augie@google.com> [Thu, 10 Sep 2015 13:45:00 -0400] rev 26225
help/config: back out 5f2a1ebd6e78
This breaks building manpages, and by association breaks building
debs. timeless has a fix coming, but it turns out we'll need to back
out 5f2a1ebd6e78 anyway, so just back it out now to fix building
packages.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Thu, 10 Sep 2015 09:41:11 -0400] rev 26224
filemerge: add non-interactive :merge-local and :merge-other
There are two non-interactive internal merge tools, :other and :local,
but they don't really merge, they just pick all changes from the local
or other version of the file. In some situations, it is known that we
want a merge and also know that all merge conflicts should be resolved
in one direction. Although external merge tools can do this, sometimes
it can be convenient to do so from within hg, without invoking a merge
tool. These new :merge-local and :merge-other tools can do just that.