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

This revision was automatically updated to reflect the committed changes. Closed by commit rHG86dfae98a3a2: merge-tools: when calling external merge tool, describe the resolve inputs (authored by spectral, committed by ). CHANGED PRIOR TO COMMIT

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

yuja added a comment. > > 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

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

> > 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. > > """ >

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

spectral added a comment. In https://phab.mercurial-scm.org/D5094#77146, @yuja wrote: > > > 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

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

spectral updated this revision to Diff 12369. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5094?vs=12106=12369 REVISION DETAIL https://phab.mercurial-scm.org/D5094 AFFECTED FILES mercurial/configitems.py mercurial/filemerge.py

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

yuja added a comment. > > 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

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

> > 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

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

spectral planned changes to this revision. spectral added a comment. In https://phab.mercurial-scm.org/D5094#76457, @yuja wrote: > > +def _describemerge(ui, repo, env, toolpath, args): > > +template = ui.config('ui', 'pre-merge-tool-output-template') > > +if not template:

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

yuja added a comment. > +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

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

> +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_'):

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

spectral updated this revision to Diff 12106. Herald added a subscriber: mjpieters. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5094?vs=12105=12106 REVISION DETAIL https://phab.mercurial-scm.org/D5094 AFFECTED FILES mercurial/configitems.py

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

spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It is a common complaint that a user will be running some operation (histedit, rebase, evolve, etc.), get into a merge-conflict situation, and not understand