| hg-reviewers |
Python 3.8 will emit a SyntaxWarning for str/bytes with invalid
escapes. This commit addresses 4 occurrences where we had a bare
\ in a str/bytes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/patch.py (8 lines) |
| if not self.rej: | if not self.rej: | ||||
| return | return | ||||
| base = os.path.basename(self.fname) | base = os.path.basename(self.fname) | ||||
| lines = ["--- %s\n+++ %s\n" % (base, base)] | lines = ["--- %s\n+++ %s\n" % (base, base)] | ||||
| for x in self.rej: | for x in self.rej: | ||||
| for l in x.hunk: | for l in x.hunk: | ||||
| lines.append(l) | lines.append(l) | ||||
| if l[-1:] != '\n': | if l[-1:] != '\n': | ||||
| lines.append("\n\ No newline at end of file\n") | lines.append("\n\\ No newline at end of file\n") | ||||
| self.backend.writerej(self.fname, len(self.rej), self.hunks, lines) | self.backend.writerej(self.fname, len(self.rej), self.hunks, lines) | ||||
| def apply(self, h): | def apply(self, h): | ||||
| if not h.complete(): | if not h.complete(): | ||||
| raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % | raise PatchError(_("bad hunk #%d %s (%d %d %d %d)") % | ||||
| (h.number, h.desc, len(h.a), h.lena, len(h.b), | (h.number, h.desc, len(h.a), h.lena, len(h.b), | ||||
| h.lenb)) | h.lenb)) | ||||
| u = ' ' + s | u = ' ' + s | ||||
| else: | else: | ||||
| raise PatchError(_("bad hunk #%d old text line %d") % | raise PatchError(_("bad hunk #%d old text line %d") % | ||||
| (self.number, x)) | (self.number, x)) | ||||
| self.a.append(u) | self.a.append(u) | ||||
| self.hunk.append(u) | self.hunk.append(u) | ||||
| l = lr.readline() | l = lr.readline() | ||||
| if l.startswith('\ '): | if l.startswith(br'\ '): | ||||
| s = self.a[-1][:-1] | s = self.a[-1][:-1] | ||||
| self.a[-1] = s | self.a[-1] = s | ||||
| self.hunk[-1] = s | self.hunk[-1] = s | ||||
| l = lr.readline() | l = lr.readline() | ||||
| m = contextdesc.match(l) | m = contextdesc.match(l) | ||||
| if not m: | if not m: | ||||
| raise PatchError(_("bad hunk #%d") % self.number) | raise PatchError(_("bad hunk #%d") % self.number) | ||||
| self.startb, bend = m.groups() | self.startb, bend = m.groups() | ||||
| self.startb = int(self.startb) | self.startb = int(self.startb) | ||||
| if bend is None: | if bend is None: | ||||
| bend = self.startb | bend = self.startb | ||||
| self.lenb = int(bend) - self.startb | self.lenb = int(bend) - self.startb | ||||
| if self.startb: | if self.startb: | ||||
| self.lenb += 1 | self.lenb += 1 | ||||
| hunki = 1 | hunki = 1 | ||||
| for x in pycompat.xrange(self.lenb): | for x in pycompat.xrange(self.lenb): | ||||
| l = lr.readline() | l = lr.readline() | ||||
| if l.startswith('\ '): | if l.startswith(br'\ '): | ||||
| # XXX: the only way to hit this is with an invalid line range. | # XXX: the only way to hit this is with an invalid line range. | ||||
| # The no-eol marker is not counted in the line range, but I | # The no-eol marker is not counted in the line range, but I | ||||
| # guess there are diff(1) out there which behave differently. | # guess there are diff(1) out there which behave differently. | ||||
| s = self.b[-1][:-1] | s = self.b[-1][:-1] | ||||
| self.b[-1] = s | self.b[-1] = s | ||||
| self.hunk[hunki - 1] = s | self.hunk[hunki - 1] = s | ||||
| continue | continue | ||||
| if not l: | if not l: | ||||
| # @@ -start,len +start,len @@ | # @@ -start,len +start,len @@ | ||||
| self.desc = "@@ -%d,%d +%d,%d @@\n" % (self.starta, self.lena, | self.desc = "@@ -%d,%d +%d,%d @@\n" % (self.starta, self.lena, | ||||
| self.startb, self.lenb) | self.startb, self.lenb) | ||||
| self.hunk[0] = self.desc | self.hunk[0] = self.desc | ||||
| self._fixnewline(lr) | self._fixnewline(lr) | ||||
| def _fixnewline(self, lr): | def _fixnewline(self, lr): | ||||
| l = lr.readline() | l = lr.readline() | ||||
| if l.startswith('\ '): | if l.startswith(br'\ '): | ||||
| diffhelper.fixnewline(self.hunk, self.a, self.b) | diffhelper.fixnewline(self.hunk, self.a, self.b) | ||||
| else: | else: | ||||
| lr.push(l) | lr.push(l) | ||||
| def complete(self): | def complete(self): | ||||
| return len(self.a) == self.lena and len(self.b) == self.lenb | return len(self.a) == self.lena and len(self.b) == self.lenb | ||||
| def _fuzzit(self, old, new, fuzz, toponly): | def _fuzzit(self, old, new, fuzz, toponly): | ||||