| hg-reviewers |
Iterating on bytes give you ascii values instead of bytechr so we need to wrap
the bytes in pycompat.bytestr() to get bytechr while iterating.
| 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 (2 lines) | |||
| M | mercurial/templater.py (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit |
| yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy()) | yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy()) | ||||
| def applybindelta(binchunk, data): | def applybindelta(binchunk, data): | ||||
| """Apply a binary delta hunk | """Apply a binary delta hunk | ||||
| The algorithm used is the algorithm from git's patch-delta.c | The algorithm used is the algorithm from git's patch-delta.c | ||||
| """ | """ | ||||
| def deltahead(binchunk): | def deltahead(binchunk): | ||||
| i = 0 | i = 0 | ||||
| for c in binchunk: | for c in pycompat.bytestr(binchunk): | ||||
| i += 1 | i += 1 | ||||
| if not (ord(c) & 0x80): | if not (ord(c) & 0x80): | ||||
| return i | return i | ||||
| return i | return i | ||||
| out = "" | out = "" | ||||
| s = deltahead(binchunk) | s = deltahead(binchunk) | ||||
| binchunk = binchunk[s:] | binchunk = binchunk[s:] | ||||
| s = deltahead(binchunk) | s = deltahead(binchunk) | ||||
| def _scantemplate(tmpl, start, stop, quote='', raw=False): | def _scantemplate(tmpl, start, stop, quote='', raw=False): | ||||
| """Parse template string into chunks of strings and template expressions""" | """Parse template string into chunks of strings and template expressions""" | ||||
| sepchars = '{' + quote | sepchars = '{' + quote | ||||
| unescape = [parser.unescapestr, pycompat.identity][raw] | unescape = [parser.unescapestr, pycompat.identity][raw] | ||||
| pos = start | pos = start | ||||
| p = parser.parser(elements) | p = parser.parser(elements) | ||||
| try: | try: | ||||
| while pos < stop: | while pos < stop: | ||||
| n = min((tmpl.find(c, pos, stop) for c in sepchars), | n = min((tmpl.find(c, pos, stop) | ||||
| for c in pycompat.bytestr(sepchars)), | |||||
| key=lambda n: (n < 0, n)) | key=lambda n: (n < 0, n)) | ||||
| if n < 0: | if n < 0: | ||||
| yield ('string', unescape(tmpl[pos:stop]), pos) | yield ('string', unescape(tmpl[pos:stop]), pos) | ||||
| pos = stop | pos = stop | ||||
| break | break | ||||
| c = tmpl[n:n + 1] | c = tmpl[n:n + 1] | ||||
| bs = 0 # count leading backslashes | bs = 0 # count leading backslashes | ||||
| if not raw: | if not raw: | ||||