Mercurial > hg-stable
view tests/test-histedit-merge-tools.t @ 44180:58c74a517a00 stable
rust-dirstatemap: cache non normal and other parent set
Performance of `hg update` was significantly worse since the introduction of
the Rust `dirstatemap`. This regression was noticed by Valentin Gatien-Baron
when working on a large repository, as it goes unnoticed for smaller
repositories like Mercurial itself.
This fix introduces the same getter/setter mechanism at `hg-core` level as
for `set/get_dirs`.
While this technique is, as previously discussed, quite suboptimal, it fixes an
important enough problem. Refactoring `hg-core` to use the typestate
pattern could be a good approach to improving code quality in a future patch.
This is a graft of stable of 83b2b829c94e
Differential Revision: https://phab.mercurial-scm.org/D8110
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Thu, 30 Jan 2020 14:57:02 +0100 |
parents | 15d2afa31e57 |
children | 5effb1992c17 |
line wrap: on
line source
Test histedit extension: Merge tools ==================================== Initialization --------------- $ . "$TESTDIR/histedit-helpers.sh" $ cat >> $HGRCPATH <<EOF > [alias] > logt = log --template '{rev}:{node|short} {desc|firstline}\n' > [extensions] > histedit= > mockmakedate = $TESTDIR/mockmakedate.py > [ui] > pre-merge-tool-output-template='pre-merge message for {node}\n' > EOF Merge conflict -------------- $ hg init r $ cd r $ echo foo > file $ hg add file $ hg ci -m "First" -d "1 0" $ echo bar > file $ hg ci -m "Second" -d "2 0" $ hg logt --graph @ 1:2aa920f62fb9 Second | o 0:7181f42b8fca First Invert the order of the commits, but fail the merge. $ hg histedit --config ui.merge=false --commands - 2>&1 <<EOF | fixbundle > pick 2aa920f62fb9 Second > pick 7181f42b8fca First > EOF merging file pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec merging file failed! Fix up the change (pick 7181f42b8fca) (hg histedit --continue to resume) $ hg histedit --abort | fixbundle 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Invert the order of the commits, and pretend the merge succeeded. $ hg histedit --config ui.merge=true --commands - 2>&1 <<EOF | fixbundle > pick 2aa920f62fb9 Second > pick 7181f42b8fca First > EOF merging file pre-merge message for b90fa2e91a6d11013945a5f684be45b84a8ca6ec 7181f42b8fca: skipping changeset (no changes)