Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/context.py @ 38751:71d6886d27cf stable
context: add missing b prefix
This fixes
mercurial/context.py:593: SyntaxError: cannot mix bytes and nonbytes literals (context.py, line 593)
in Python 3.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 30 Jul 2018 09:50:32 -0400 |
| parents | 6a032a8f741b |
| children | 545a3e6650cd |
comparison
equal
deleted
inserted
replaced
| 38750:a8bfaf592033 | 38751:71d6886d27cf |
|---|---|
| 589 short(n) for n in sorted(cahs) if n != anc)) | 589 short(n) for n in sorted(cahs) if n != anc)) |
| 590 return changectx(self._repo, anc) | 590 return changectx(self._repo, anc) |
| 591 | 591 |
| 592 def descendant(self, other): | 592 def descendant(self, other): |
| 593 msg = (b'ctx.descendant(other) is deprecated, ' | 593 msg = (b'ctx.descendant(other) is deprecated, ' |
| 594 'use ctx.isancestorof(other)') | 594 b'use ctx.isancestorof(other)') |
| 595 self._repo.ui.deprecwarn(msg, b'4.7') | 595 self._repo.ui.deprecwarn(msg, b'4.7') |
| 596 return self.isancestorof(other) | 596 return self.isancestorof(other) |
| 597 | 597 |
| 598 def isancestorof(self, other): | 598 def isancestorof(self, other): |
| 599 """True if this changeset is an ancestor of other""" | 599 """True if this changeset is an ancestor of other""" |