This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2616

py3: replace __str__ to __bytes__ in hgext/journal.py
ClosedPublic

Authored by pulkit on Mar 3 2018, 6:18 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd79d68bb9f7c: py3: replace __str__ to __bytes__ in hgext/journal.py
rHG148f64bcb6de: py3: replace __str__ to __bytes__ in hgext/journal.py

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 3 2018, 6:18 PM
indygreg accepted this revision.Mar 3 2018, 6:21 PM
This revision is now accepted and ready to land.Mar 3 2018, 6:21 PM
Closed by commit rHG148f64bcb6de: py3: replace __str__ to __bytes__ in hgext/journal.py (authored by pulkit). · Explain WhyMar 3 2018, 6:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/journal.py (7 lines)

Diff 6504

hgext/journal.py

import weakref import weakref
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
bookmarks, bookmarks,
cmdutil, cmdutil,
dispatch, dispatch,
encoding,
error, error,
extensions, extensions,
hg, hg,
localrepo, localrepo,
lock, lock,
logcmdutil, logcmdutil,
node, node,
pycompat, pycompat,
timestamp, tz = time.split() timestamp, tz = time.split()
timestamp, tz = float(timestamp), int(tz) timestamp, tz = float(timestamp), int(tz)
oldhashes = tuple(node.bin(hash) for hash in oldhashes.split(',')) oldhashes = tuple(node.bin(hash) for hash in oldhashes.split(','))
newhashes = tuple(node.bin(hash) for hash in newhashes.split(',')) newhashes = tuple(node.bin(hash) for hash in newhashes.split(','))
return cls( return cls(
(timestamp, tz), user, command, namespace, name, (timestamp, tz), user, command, namespace, name,
oldhashes, newhashes) oldhashes, newhashes)
def __str__(self): def __bytes__(self):
"""String representation for storage""" """bytes representation for storage"""
time = ' '.join(map(str, self.timestamp)) time = ' '.join(map(str, self.timestamp))
oldhashes = ','.join([node.hex(hash) for hash in self.oldhashes]) oldhashes = ','.join([node.hex(hash) for hash in self.oldhashes])
newhashes = ','.join([node.hex(hash) for hash in self.newhashes]) newhashes = ','.join([node.hex(hash) for hash in self.newhashes])
return '\n'.join(( return '\n'.join((
time, self.user, self.command, self.namespace, self.name, time, self.user, self.command, self.namespace, self.name,
oldhashes, newhashes)) oldhashes, newhashes))
__str__ = encoding.strmethod(__bytes__)
class journalstorage(object): class journalstorage(object):
"""Storage for journal entries """Storage for journal entries
Entries are divided over two files; one with entries that pertain to the Entries are divided over two files; one with entries that pertain to the
local working copy *only*, and one with entries that are shared across local working copy *only*, and one with entries that are shared across
multiple working copies when shared using the share extension. multiple working copies when shared using the share extension.
Entries are stored with NUL bytes as separators. See the journalentry Entries are stored with NUL bytes as separators. See the journalentry