Mercurial > hg
view tests/test-debugextensions.t @ 39576:fa4d16daf1be
context: don't count deleted files as candidates for path conflicts in IMM
This patch makes sure we don't consider the deleted files in our IMM wctx
as potential conflicts while calculating paths conflicts. This fixes the bug
demonstrated in previous patch.
Differential Revision: https://phab.mercurial-scm.org/D4543
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Wed, 12 Sep 2018 17:45:43 +0300 |
parents | 4e6a6d0dccee |
children | 4836705ab9ba |
line wrap: on
line source
#if no-extraextensions $ hg debugextensions #endif $ debugpath=`pwd`/extwithoutinfos.py $ cat > extwithoutinfos.py <<EOF > EOF $ cat > extwithinfos.py <<EOF > testedwith = b'3.0 3.1 3.2.1' > buglink = b'https://example.org/bts' > EOF $ cat >> $HGRCPATH <<EOF > [extensions] > histedit= > patchbomb= > rebase= > mq= > ext1 = $debugpath > ext2 = `pwd`/extwithinfos.py > EOF $ for extension in $HGTESTEXTRAEXTENSIONS; do > echo "$extension=!" >> $HGRCPATH > done $ hg debugextensions ext1 (untested!) ext2 (3.2.1!) histedit mq patchbomb rebase $ hg debugextensions -v ext1 location: */extwithoutinfos.py* (glob) bundled: no ext2 location: */extwithinfos.py* (glob) bundled: no tested with: 3.0 3.1 3.2.1 bug reporting: https://example.org/bts histedit location: */hgext/histedit.py* (glob) bundled: yes mq location: */hgext/mq.py* (glob) bundled: yes patchbomb location: */hgext/patchbomb.py* (glob) bundled: yes rebase location: */hgext/rebase.py* (glob) bundled: yes $ hg debugextensions -Tjson | sed 's|\\\\|/|g' [ { "buglink": "", "bundled": false, "name": "ext1", "source": "*/extwithoutinfos.py*", (glob) "testedwith": [] }, { "buglink": "https://example.org/bts", "bundled": false, "name": "ext2", "source": "*/extwithinfos.py*", (glob) "testedwith": ["3.0", "3.1", "3.2.1"] }, { "buglink": "", "bundled": true, "name": "histedit", "source": "*/hgext/histedit.py*", (glob) "testedwith": [] }, { "buglink": "", "bundled": true, "name": "mq", "source": "*/hgext/mq.py*", (glob) "testedwith": [] }, { "buglink": "", "bundled": true, "name": "patchbomb", "source": "*/hgext/patchbomb.py*", (glob) "testedwith": [] }, { "buglink": "", "bundled": true, "name": "rebase", "source": "*/hgext/rebase.py*", (glob) "testedwith": [] } ] $ hg debugextensions -T '{ifcontains("3.1", testedwith, "{name}\n")}' ext2 $ hg debugextensions \ > -T '{ifcontains("3.2", testedwith, "no substring match: {name}\n")}'