Tue, 05 Jun 2018 12:04:15 +0200 shelve: use more accurate description in conflict marker
Boris Feld <boris.feld@octobus.net> [Tue, 05 Jun 2018 12:04:15 +0200] rev 38619
shelve: use more accurate description in conflict marker We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. Differential Revision: https://phab.mercurial-scm.org/D3694
Tue, 29 May 2018 00:30:50 +0200 shelve: directly handle the initial parent alignment
Boris Feld <boris.feld@octobus.net> [Tue, 29 May 2018 00:30:50 +0200] rev 38618
shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693
Thu, 24 May 2018 17:39:07 +0200 run-tests: extract onStart and onEnd into the test result
Boris Feld <boris.feld@octobus.net> [Thu, 24 May 2018 17:39:07 +0200] rev 38617
run-tests: extract onStart and onEnd into the test result It would allow custom test result to display custom messages. Differential Revision: https://phab.mercurial-scm.org/D3701
Sat, 28 Apr 2018 12:51:44 +0200 run-tests: add support for external test result
Boris Feld <boris.feld@octobus.net> [Sat, 28 Apr 2018 12:51:44 +0200] rev 38616
run-tests: add support for external test result The goal is to begin experiment with custom test result. I'm not sure we should offers any backward-compatibility guarantee on that plugin API as it doesn't change often and shouldn't have too much clients. Differential Revision: https://phab.mercurial-scm.org/D3700
Sun, 01 Jul 2018 23:36:53 +0900 encoding: alias cp65001 to utf-8 on Windows stable
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Jul 2018 23:36:53 +0900] rev 38615
encoding: alias cp65001 to utf-8 on Windows As far as I can tell, cp65001 is the Windows name for UTF-8. I don't know how different it is from the UTF-8, but Python 3 appears to have introduced new codec for cp65001, so the alias is enabled only for Python 2. https://bugs.python.org/issue13216 This patch is untested, but hopefully fixes the following issue. https://bitbucket.org/tortoisehg/thg/issues/5127/
Thu, 15 Mar 2018 17:37:03 +0530 remotenames: synchronise remotenames after push also
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 15 Mar 2018 17:37:03 +0530] rev 38614
remotenames: synchronise remotenames after push also Earlier we use to pull remotenames information from the server in case of pull and clone only. This patch adds logic to push also command to pull remotenames information. This will help us in keeping the remotenames more upto date where there are a lot people changing state of branches and bookmarks at the server. Differential Revision: https://phab.mercurial-scm.org/D2874
Sun, 10 Jun 2018 20:45:13 +0900 fileset: pass in badfn to inner matchers
Yuya Nishihara <yuya@tcha.org> [Sun, 10 Jun 2018 20:45:13 +0900] rev 38613
fileset: pass in badfn to inner matchers Just for sanity. No idea if this will make a difference, but it should propagate the badfn because the matcher created by mctx.matcher() will be returned by fileset.match() in future patches.
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 tip