Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 37470:d658cbef8041
py3: do not try to byte-stringify None in cmdutil.tryimportone()
It's a debug message, so just use '' instead.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 08 Apr 2018 15:32:09 +0900 |
| parents | 8823615f68a5 |
| children | d110167610db |
comparison
equal
deleted
inserted
replaced
| 37469:7edf68862fe3 | 37470:d658cbef8041 |
|---|---|
| 1396 # pickup the patch msg | 1396 # pickup the patch msg |
| 1397 message = message.strip() | 1397 message = message.strip() |
| 1398 else: | 1398 else: |
| 1399 # launch the editor | 1399 # launch the editor |
| 1400 message = None | 1400 message = None |
| 1401 ui.debug('message:\n%s\n' % message) | 1401 ui.debug('message:\n%s\n' % (message or '')) |
| 1402 | 1402 |
| 1403 if len(parents) == 1: | 1403 if len(parents) == 1: |
| 1404 parents.append(repo[nullid]) | 1404 parents.append(repo[nullid]) |
| 1405 if opts.get('exact'): | 1405 if opts.get('exact'): |
| 1406 if not nodeid or not p1: | 1406 if not nodeid or not p1: |