Tue, 14 Mar 2017 17:43:44 -0700 rebase: add flag to require destination
Ryan McElroy <rmcelroy@fb.com> [Tue, 14 Mar 2017 17:43:44 -0700] rev 31558
rebase: add flag to require destination In some mercurial workflows, the default destination for rebase does not always work well and can lead to confusing behavior. With this flag enabled, every rebase command will require passing an explicit destination, eliminating this confusion.
Tue, 14 Mar 2017 17:43:18 -0700 update: add flag to require update destination
Ryan McElroy <rmcelroy@fb.com> [Tue, 14 Mar 2017 17:43:18 -0700] rev 31557
update: add flag to require update destination In some mercurial workflows, the default destination for update does not always work well and can lead to confusing behavior. With this flag enabled, every update command will require passing an explicit destination, eliminating this confusion.
Mon, 20 Mar 2017 11:38:37 +0900 mq: reject new patch name containing leading/trailing whitespace
Yuya Nishihara <yuya@tcha.org> [Mon, 20 Mar 2017 11:38:37 +0900] rev 31556
mq: reject new patch name containing leading/trailing whitespace We could create a patch of such name, but it wouldn't be processed properly by mq as parseseries() strips leading/trailing whitespace. The test of default message (added by b9a16ed5acec) is no longer be useful so removed. This issue was reported as: https://bitbucket.org/tortoisehg/thg/issues/4693/
Fri, 10 Mar 2017 16:18:43 -0800 shelve: rename stripnodes to nodestoprune
Kostia Balytskyi <ikostia@fb.com> [Fri, 10 Mar 2017 16:18:43 -0800] rev 31555
shelve: rename stripnodes to nodestoprune Since we are introducing obs-based shelve, we are no longer stripping temporary nodes, we are obsoleting them. Therefore it looks like stipnodes would be a misleading name, while prune has a connotaion of "strip but with obsolescense", so nodestoprune seems like a good rename.
Fri, 10 Mar 2017 15:03:09 -0800 shelve: add an ability to write key-val data to a new type of shelve files
Kostia Balytskyi <ikostia@fb.com> [Fri, 10 Mar 2017 15:03:09 -0800] rev 31554
shelve: add an ability to write key-val data to a new type of shelve files Obsolescense-based shelve only needs metadata stored in .hg/shelved and if feels that this metadata should be stored in a simplekeyvaluefile format for potential extensibility purposes. I want to avoid storing it in an unstructured text file where order of lines determines their semantical meanings (as now happens in .hg/shelvedstate. .hg/rebasestate and I suspect other state files as well). Not included in this series, I have ~30 commits, doubling test-shelve.t in size and testing almost every tested shelve usecase for obs-shelve. Here's the series for the curious now: http://pastebin.com/tGJKx0vM I would like to send it to the mailing list and get accepted as well, but: 1. it's big, so should I send like 6 patches a time or so? 2. instead of having a commit per test case, it more like a commit per some amount of copy-pasted code. I tried to keep it meaningful and named commits somewhat properly, but it is far from this list standards IMO. Any advice on how to get it in without turning it into a 100 commits and spending many days writing descriptions? 3. it makes test-shelve.t run for twice as long (and it is already a slow test). Newest test-shelve.r runs for ~1 minute.
Fri, 10 Mar 2017 14:33:42 -0800 scmutil: add a simple key-value file helper
Kostia Balytskyi <ikostia@fb.com> [Fri, 10 Mar 2017 14:33:42 -0800] rev 31553
scmutil: add a simple key-value file helper The purpose of the added class is to serve purposes like save files of shelve or state files of shelve, rebase and histedit. Keys of these files can be alphanumeric and start with letters, while values must not contain newlines. In light of Mercurial's reluctancy to use Python's json module, this tries to provide a reasonable alternative for a non-nested named data. Comparing to current approach of storing state in plain text files, where semantic meaning of lines of text is only determined by their oreder, simple key-value file allows for reordering lines and thus helps handle optional values. Initial use-case I see for this is obs-shelve's shelve files. Later we can possibly migrate state files to this approach. The test is in a new file beause I did not figure out where to put it within existing test suite. If you give me a better idea, I will gladly follow it.
Mon, 20 Mar 2017 11:50:55 +0900 graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org> [Mon, 20 Mar 2017 11:50:55 +0900] rev 31552
graphlog: draw multiple edges towards null node (issue5440) Before, edge (r, null) was processed only once by newparents. However what we really need is just stripping the edge (null, null).
Tue, 21 Mar 2017 18:36:14 -0400 merge with stable
Augie Fackler <augie@google.com> [Tue, 21 Mar 2017 18:36:14 -0400] rev 31551
merge with stable
Tue, 21 Mar 2017 06:50:28 -0700 localrepo: use tryunlink
Ryan McElroy <rmcelroy@fb.com> [Tue, 21 Mar 2017 06:50:28 -0700] rev 31550
localrepo: use tryunlink
Tue, 21 Mar 2017 06:50:28 -0700 vfs: use tryunlink
Ryan McElroy <rmcelroy@fb.com> [Tue, 21 Mar 2017 06:50:28 -0700] rev 31549
vfs: use tryunlink
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip