Mercurial > hg
view hgext/narrow/narrowrepo.py @ 48966:b10a944c0486 stable
tests: demonstrate how conflict markers end up $local *and* $output
When a merge tool is configured to keep conflict markers, they are
supposed to be written to `$local` if `$output` is not mentioned in
the tool's `merge-tools.<tool>.args` config, and in `$output` if it is
mentioned. However, I broke the latter case in D12190.
Differential Revision: https://phab.mercurial-scm.org/D12378
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 15 Mar 2022 13:40:45 -0700 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
line wrap: on
line source
# narrowrepo.py - repository which supports narrow revlogs, lazy loading # # Copyright 2017 Google, Inc. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from mercurial import wireprototypes from . import narrowdirstate def wraprepo(repo): """Enables narrow clone functionality on a single local repository.""" class narrowrepository(repo.__class__): def _makedirstate(self): dirstate = super(narrowrepository, self)._makedirstate() return narrowdirstate.wrapdirstate(self, dirstate) def peer(self): peer = super(narrowrepository, self).peer() peer._caps.add(wireprototypes.NARROWCAP) peer._caps.add(wireprototypes.ELLIPSESCAP) return peer repo.__class__ = narrowrepository