| yuja |
| hg-reviewers |
map() on Python 3 returns a map object not a list, so let's use list
comprehension where we require list.
| Lint Skipped |
| Unit Tests Skipped |
| 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 __bytes__(self): | def __bytes__(self): | ||||
| """bytes representation for storage""" | """bytes representation for storage""" | ||||
| time = ' '.join(map(pycompat.bytestr, self.timestamp)) | time = ' '.join([pycompat.bytestr(a) for a in 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__) | __str__ = encoding.strmethod(__bytes__) | ||||
| if sharedrepo is not None and 'journal' in features: | if sharedrepo is not None and 'journal' in features: | ||||
| self.sharedvfs = sharedrepo.vfs | self.sharedvfs = sharedrepo.vfs | ||||
| self.sharedfeatures = features | self.sharedfeatures = features | ||||
| # track the current command for recording in journal entries | # track the current command for recording in journal entries | ||||
| @property | @property | ||||
| def command(self): | def command(self): | ||||
| commandstr = ' '.join( | commandstr = ' '.join( | ||||
| map(procutil.shellquote, journalstorage._currentcommand)) | [procutil.shellquote(a) for a in journalstorage._currentcommand]) | ||||
| if '\n' in commandstr: | if '\n' in commandstr: | ||||
| # truncate multi-line commands | # truncate multi-line commands | ||||
| commandstr = commandstr.partition('\n')[0] + ' ...' | commandstr = commandstr.partition('\n')[0] + ' ...' | ||||
| return commandstr | return commandstr | ||||
| @classmethod | @classmethod | ||||
| def recordcommand(cls, *fullargs): | def recordcommand(cls, *fullargs): | ||||
| """Set the current hg arguments, stored with recorded entries""" | """Set the current hg arguments, stored with recorded entries""" | ||||