| dsp |
| hg-reviewers |
Rename prednode (predecessors node) into precnode (precursors node) in markers
class. Use util.nouideprecwarn because markers doesn't have easy access to an
ui object.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
| Lint Skipped |
| Unit Tests Skipped |
| mercurial/cmdutil.py | ||
|---|---|---|
| 1916 | I'm not sure to see which template keyword you are talking about. | |
| mercurial/cmdutil.py | ||
|---|---|---|
| 1916 | I've send a follow-up: https://phab.mercurial-scm.org/D414 | |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (2 lines) | |||
| M | mercurial/obsutil.py (11 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan | ||
| Closed | lothiraldan |
| return changeset_templater(ui, repo, spec, matchfn, opts, buffered) | return changeset_templater(ui, repo, spec, matchfn, opts, buffered) | ||||
| def showmarker(fm, marker, index=None): | def showmarker(fm, marker, index=None): | ||||
| """utility function to display obsolescence marker in a readable way | """utility function to display obsolescence marker in a readable way | ||||
| To be used by debug function.""" | To be used by debug function.""" | ||||
| if index is not None: | if index is not None: | ||||
| fm.write('index', '%i ', index) | fm.write('index', '%i ', index) | ||||
| fm.write('precnode', '%s ', hex(marker.precnode())) | fm.write('precnode', '%s ', hex(marker.prednode())) | ||||
yuja: The template keyword should be updated as well. Please send a follow-up. | |||||
lothiraldanAuthorUnsubmitted Done I'm not sure to see which template keyword you are talking about. lothiraldan: I'm not sure to see which template keyword you are talking about. | |||||
yujaUnsubmitted Not Done fm.write('prednode', ...) yuja: `fm.write('prednode', ...)` | |||||
lothiraldanAuthorUnsubmitted Not Done I've send a follow-up: https://phab.mercurial-scm.org/D414 lothiraldan: I've send a follow-up: https://phab.mercurial-scm.org/D414 | |||||
| succs = marker.succnodes() | succs = marker.succnodes() | ||||
| fm.condwrite(succs, 'succnodes', '%s ', | fm.condwrite(succs, 'succnodes', '%s ', | ||||
| fm.formatlist(map(hex, succs), name='node')) | fm.formatlist(map(hex, succs), name='node')) | ||||
| fm.write('flag', '%X ', marker.flags()) | fm.write('flag', '%X ', marker.flags()) | ||||
| parents = marker.parentnodes() | parents = marker.parentnodes() | ||||
| if parents is not None: | if parents is not None: | ||||
| fm.write('parentnodes', '{%s} ', | fm.write('parentnodes', '{%s} ', | ||||
| fm.formatlist(map(hex, parents), name='node', sep=', ')) | fm.formatlist(map(hex, parents), name='node', sep=', ')) | ||||
| # obsutil.py - utility functions for obsolescence | # obsutil.py - utility functions for obsolescence | ||||
| # | # | ||||
| # Copyright 2017 Boris Feld <boris.feld@octobus.net> | # Copyright 2017 Boris Feld <boris.feld@octobus.net> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from . import ( | from . import ( | ||||
| phases, | phases, | ||||
| util | |||||
| ) | ) | ||||
| class marker(object): | class marker(object): | ||||
| """Wrap obsolete marker raw data""" | """Wrap obsolete marker raw data""" | ||||
| def __init__(self, repo, data): | def __init__(self, repo, data): | ||||
| # the repo argument will be used to create changectx in later version | # the repo argument will be used to create changectx in later version | ||||
| self._repo = repo | self._repo = repo | ||||
| self._data = data | self._data = data | ||||
| self._decodedmeta = None | self._decodedmeta = None | ||||
| def __hash__(self): | def __hash__(self): | ||||
| return hash(self._data) | return hash(self._data) | ||||
| def __eq__(self, other): | def __eq__(self, other): | ||||
| if type(other) != type(self): | if type(other) != type(self): | ||||
| return False | return False | ||||
| return self._data == other._data | return self._data == other._data | ||||
| def precnode(self): | def precnode(self): | ||||
| """Precursor changeset node identifier""" | msg = ("'marker.precnode' is deprecated, " | ||||
| "use 'marker.precnode'") | |||||
| util.nouideprecwarn(msg, '4.4') | |||||
| return self.prednode() | |||||
| def prednode(self): | |||||
| """Predecessor changeset node identifier""" | |||||
| return self._data[0] | return self._data[0] | ||||
| def succnodes(self): | def succnodes(self): | ||||
| """List of successor changesets node identifiers""" | """List of successor changesets node identifiers""" | ||||
| return self._data[1] | return self._data[1] | ||||
| def parentnodes(self): | def parentnodes(self): | ||||
| """Parents of the precursors (None if not recorded)""" | """Parents of the predecessors (None if not recorded)""" | ||||
| return self._data[5] | return self._data[5] | ||||
| def metadata(self): | def metadata(self): | ||||
| """Decoded metadata dictionary""" | """Decoded metadata dictionary""" | ||||
| return dict(self._data[3]) | return dict(self._data[3]) | ||||
| def date(self): | def date(self): | ||||
| """Creation date as (unixtime, offset)""" | """Creation date as (unixtime, offset)""" | ||||
The template keyword should be updated as well. Please send a follow-up.