Re: D5094: merge-tools: when calling external merge tool, describe the resolve inputs

2018-11-02 Thread Yuya Nishihara
> > class mappingdict(mappable, _mappingsequence): > > """Wrapper for a single template mapping > > > > This isn't a sequence in a way that the underlying dict won't be > iterated > > as a dict, but shares most of the _mappingsequence functions. > > """ >

Re: D5094: merge-tools: when calling external merge tool, describe the resolve inputs

2018-10-19 Thread Yuya Nishihara
> > We might want to structure these variables as `base.node|short` instead of > > `base_node` for example, but that would require more work. [...] > Unfortunately, this doesn't work super well, when using the following flags: There isn't a building block for a mapping dict holding mapping

Re: D5094: merge-tools: when calling external merge tool, describe the resolve inputs

2018-10-16 Thread Yuya Nishihara
> +def _describemerge(ui, repo, env, toolpath, args): > +template = ui.config('ui', 'pre-merge-tool-output-template') > +if not template: > +return > + > +# Remove HG_ prefix from entries in `env` and lowercase them > +def sanitizeenv(k): > +if k.startswith('HG_'):