This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6185

changelog: pass default extras into decodeextra()
AbandonedPublic

Authored by martinvonz on Apr 2 2019, 3:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

I want to use the function with a different default (empty dict, to be
specific) and this enables that.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 2 2019, 3:30 PM
yuja added a subscriber: yuja.Apr 13 2019, 7:45 AM

+def decodeextra(text, default):

"""
>>> from .pycompat import bytechr as chr
  • >>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'})
  • ... ).items())

+ >>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'}),
+ ... _defaultextra).items())

[('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
>>> sorted(decodeextra(encodeextra({b'foo': b'bar',
  • ... b'baz': chr(92) + chr(0) + b'2'})
  • ... ).items())

+ ... b'baz': chr(92) + chr(0) + b'2'}),
+ ... _defaultextra).items())

Maybe these tests update _defaultextra in place?

[('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')]
"""
  • extra = _defaultextra.copy()

+ extra = default

I think it's safer to do default.copy() here.

for l in text.split('\0'):
    if l:
        k, v = _string_unescape(l).split(':', 1)

@@ -275,7 +275,7 @@

if raw is None:
    return _defaultextra
  • return decodeextra(raw)

+ return decodeextra(raw, _defaultextra.copy())

martinvonz added a comment.Apr 13 2019, 6:14 PM
In D6185#90696, @yuja wrote:

+def decodeextra(text, default):

"""
>>> from .pycompat import bytechr as chr
  • >>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'})
  • ... ).items())

+ >>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'}),
+ ... _defaultextra).items())

[('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
>>> sorted(decodeextra(encodeextra({b'foo': b'bar',
  • ... b'baz': chr(92) + chr(0) + b'2'})
  • ... ).items())

+ ... b'baz': chr(92) + chr(0) + b'2'}),
+ ... _defaultextra).items())

Maybe these tests update _defaultextra in place?

[('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')]
"""
  • extra = _defaultextra.copy()

+ extra = default

I think it's safer to do default.copy() here.

Good point. I'll change it.

for l in text.split('\0'):
    if l:
        k, v = _string_unescape(l).split(':', 1)

@@ -275,7 +275,7 @@

if raw is None:
    return _defaultextra
  • return decodeextra(raw)

+ return decodeextra(raw, _defaultextra.copy())

martinvonz updated this revision to Diff 14735.Apr 13 2019, 6:16 PM
martinvonz abandoned this revision.Apr 13 2019, 6:19 PM

Oh, I actually don't need this patch anymore since I added the string_unescape() method. I'll drop this one.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (14 lines)

Diff 14735

mercurial/changelog.py

def _string_unescape(text): def _string_unescape(text):
if '\\0' in text: if '\\0' in text:
# fix up \0 without getting into trouble with \\0 # fix up \0 without getting into trouble with \\0
text = text.replace('\\\\', '\\\\\n') text = text.replace('\\\\', '\\\\\n')
text = text.replace('\\0', '\0') text = text.replace('\\0', '\0')
text = text.replace('\n', '') text = text.replace('\n', '')
return stringutil.unescapestr(text) return stringutil.unescapestr(text)
def decodeextra(text): def decodeextra(text, default):
""" """
>>> from .pycompat import bytechr as chr >>> from .pycompat import bytechr as chr
>>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'}) >>> sorted(decodeextra(encodeextra({b'foo': b'bar', b'baz': chr(0) + b'2'}),
... ).items()) ... _defaultextra).items())
[('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')] [('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')]
>>> sorted(decodeextra(encodeextra({b'foo': b'bar', >>> sorted(decodeextra(encodeextra({b'foo': b'bar',
... b'baz': chr(92) + chr(0) + b'2'}) ... b'baz': chr(92) + chr(0) + b'2'}),
... ).items()) ... _defaultextra).items())
[('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')] [('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')]
""" """
extra = _defaultextra.copy() extra = default.copy()
for l in text.split('\0'): for l in text.split('\0'):
if l: if l:
k, v = _string_unescape(l).split(':', 1) k, v = _string_unescape(l).split(':', 1)
extra[k] = v extra[k] = v
return extra return extra
def encodeextra(d): def encodeextra(d):
# keys must be sorted to produce a deterministic changelog entry # keys must be sorted to produce a deterministic changelog entry
return time, timezone return time, timezone
@property @property
def extra(self): def extra(self):
raw = self._rawextra raw = self._rawextra
if raw is None: if raw is None:
return _defaultextra return _defaultextra
return decodeextra(raw) return decodeextra(raw, _defaultextra)
@property @property
def files(self): def files(self):
off = self._offsets off = self._offsets
if off[2] == off[3]: if off[2] == off[3]:
return [] return []
return self._text[off[2] + 1:off[3]].split('\n') return self._text[off[2] + 1:off[3]].split('\n')