mercurial at 48773: 25 new changesets

[Mercurial Commits]

25 new changesets in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/9ee70e175fed
changeset:   48749:9ee70e175fed
parent:      48746:18e69f224e4b
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Feb 10 09:59:07 2022 -0800
summary:     simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments

https://www.mercurial-scm.org/repo/hg/rev/aed8ef33db8b
changeset:   48750:aed8ef33db8b
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Fri Feb 04 18:36:36 2022 -0800
summary:     simplemerge: convert MergeInput to regular, non-attr.ib class

https://www.mercurial-scm.org/repo/hg/rev/59c6724ddccb
changeset:   48751:59c6724ddccb
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Feb 10 11:00:32 2022 -0800
summary:     simplemerge: store input data in MergeInput

https://www.mercurial-scm.org/repo/hg/rev/109fec7bf7de
changeset:   48752:109fec7bf7de
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Feb 10 13:36:09 2022 -0800
summary:     simplemerge: let extension check for binary inputs (unless `--text`)

https://www.mercurial-scm.org/repo/hg/rev/d9af7c1fb619
changeset:   48753:d9af7c1fb619
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Feb 10 15:27:58 2022 -0800
summary:     simplemerge: let filemerge check for binary inputs

https://www.mercurial-scm.org/repo/hg/rev/d9602f0df4f3
changeset:   48754:d9602f0df4f3
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Thu Feb 10 15:48:01 2022 -0800
summary:     simplemerge: remove code for checking binary input now that callers do it

https://www.mercurial-scm.org/repo/hg/rev/6ae3c97a0919
changeset:   48755:6ae3c97a0919
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Fri Jan 14 08:17:13 2022 -0800
summary:     simplemerge: move printing of merge result to extension

https://www.mercurial-scm.org/repo/hg/rev/86e4b86df932
changeset:   48756:86e4b86df932
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Jan 18 12:57:55 2022 -0800
summary:     filemerge: when not keeping premerge, don't write markers to context

https://www.mercurial-scm.org/repo/hg/rev/af9f2c64302e
changeset:   48757:af9f2c64302e
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Jan 18 13:22:55 2022 -0800
summary:     merge: fix documented order of `labels` argument

https://www.mercurial-scm.org/repo/hg/rev/7dad4665d223
changeset:   48758:7dad4665d223
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Feb 07 14:07:04 2022 -0800
summary:     simplemerge: remove now-unused arguments

https://www.mercurial-scm.org/repo/hg/rev/d169e651066b
changeset:   48759:d169e651066b
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Feb 07 20:12:09 2022 -0800
summary:     mergestate: use an early return for trivial merges

https://www.mercurial-scm.org/repo/hg/rev/93d6f0e7ba2f
changeset:   48760:93d6f0e7ba2f
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Feb 07 22:54:38 2022 -0800
summary:     filemerge: move check for identical sides out of filemerge()

https://www.mercurial-scm.org/repo/hg/rev/2e949ede7350
changeset:   48761:2e949ede7350
user:        Pierre-Yves David <pierre-yves.david at octobus.net>
date:        Fri Jan 28 11:33:01 2022 +0100
summary:     rank: naive rank property computation and retrieval

https://www.mercurial-scm.org/repo/hg/rev/d5121df04808
changeset:   48762:d5121df04808
user:        Pierre-Yves David <pierre-yves.david at octobus.net>
date:        Fri Jan 28 11:35:41 2022 +0100
summary:     rank: add context and template keyword

https://www.mercurial-scm.org/repo/hg/rev/3984e7d4b9fd
changeset:   48763:3984e7d4b9fd
user:        pacien <pacien.trangirard at pacien.net>
date:        Fri Jan 28 11:45:18 2022 +0100
summary:     rank: add minimal test

https://www.mercurial-scm.org/repo/hg/rev/f7d7facd7b9f
changeset:   48764:f7d7facd7b9f
user:        Pierre-Yves David <pierre-yves.david at octobus.net>
date:        Fri Jan 28 11:45:33 2022 +0100
summary:     rank: add test with golden values

https://www.mercurial-scm.org/repo/hg/rev/580660518459
changeset:   48765:580660518459
user:        pacien <pacien.trangirard at pacien.net>
date:        Fri Jan 28 11:54:44 2022 +0100
summary:     rank: compute property incrementally

https://www.mercurial-scm.org/repo/hg/rev/d9a7131648a3
changeset:   48766:d9a7131648a3
user:        Pierre-Yves David <pierre-yves.david at octobus.net>
date:        Fri Feb 11 05:37:19 2022 +0100
summary:     revlog: do not compute node location by hand in index_invalidate_added

https://www.mercurial-scm.org/repo/hg/rev/654baf1faa52
changeset:   48767:654baf1faa52
user:        pacien <pacien.trangirard at pacien.net>
date:        Thu Feb 10 16:20:14 2022 +0100
summary:     revlog: memset whole record instead of dealing with padding

https://www.mercurial-scm.org/repo/hg/rev/7dd5a2c0116a
changeset:   48768:7dd5a2c0116a
user:        pacien <pacien.trangirard at pacien.net>
date:        Mon Feb 14 12:34:02 2022 +0100
summary:     revlog: implement changelogv2 packing and unpacking in C

https://www.mercurial-scm.org/repo/hg/rev/1bb62821f080
changeset:   48769:1bb62821f080
user:        pacien <pacien.trangirard at pacien.net>
date:        Mon Feb 07 13:23:58 2022 +0100
summary:     revlog: register changelogv2 C implementation in parsers

https://www.mercurial-scm.org/repo/hg/rev/f19be290756a
changeset:   48770:f19be290756a
user:        Raphaël Gomès <rgomes at octobus.net>
date:        Fri Nov 26 15:38:04 2021 +0100
summary:     rhg: signal when falling back in logs

https://www.mercurial-scm.org/repo/hg/rev/79a967128055
changeset:   48771:79a967128055
user:        Pierre-Yves David <pierre-yves.david at octobus.net>
date:        Tue Feb 15 05:20:46 2022 +0100
summary:     dirstate-tracked-key: update the config value to match latest discussion

https://www.mercurial-scm.org/repo/hg/rev/b70c9697ab41
changeset:   48772:b70c9697ab41
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Fri Feb 11 16:52:48 2022 -0800
summary:     filemerge: put temporary files in single temp dir by default

https://www.mercurial-scm.org/repo/hg/rev/6cfa30681a1d
changeset:   48773:6cfa30681a1d
bookmark:    @
tag:         tip
parent:      48772:b70c9697ab41
parent:      48743:a1538c05d855
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Feb 15 20:24:46 2022 -0800
summary:     branching: merge with stable

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg