Mercurial > hg
view tests/revnamesext.py @ 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 | 086fc71fbb09 |
children | 2372284d9457 |
line wrap: on
line source
# Dummy extension to define a namespace containing revision names from __future__ import absolute_import from mercurial import ( namespaces, ) def reposetup(ui, repo): names = {b'r%d' % rev: repo[rev].node() for rev in repo} namemap = lambda r, name: names.get(name) nodemap = lambda r, node: [b'r%d' % repo[node].rev()] ns = namespaces.namespace(b'revnames', templatename=b'revname', logname=b'revname', listnames=lambda r: names.keys(), namemap=namemap, nodemap=nodemap) repo.names.addnamespace(ns)