Yuya Nishihara <yuya@tcha.org> [Sun, 01 Nov 2015 13:58:32 +0900] rev 27007
hgweb: alias ui module as uimod
It will be enforced by the import checker.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 14:23:26 -0800] rev 27006
mergestate.commit: factor out making the list of records
Will aid in testing.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 14:04:56 -0800] rev 27005
mergestate: move _read() call to read constructor
With this patch, mergestate.clean() will no longer abort when it encounters an
unsupported merge type. However we hold off on testing it until backwards
compatibility is in place.
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 14:22:30 -0800] rev 27004
debugmergestate: explain why we create mergestate objects directly
We would normally use the read() constructor, but in this case it's fine
because
- we implement our own reading layer, so the extra parsing done by
read() is unnecessary
- read() can raise an exception for unsupported merge state records,
but here we'd like to handle that separately
- debugmergestate needs to be privy to mergestate internals anyway