| indygreg |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/eol.py (2 lines) | |||
| M | hgext/journal.py (2 lines) | |||
| M | hgext/mq.py (2 lines) |
| continue | continue | ||||
| for pattern, key, m in self.patterns: | for pattern, key, m in self.patterns: | ||||
| if not m(f): | if not m(f): | ||||
| continue | continue | ||||
| target = self._encode[key] | target = self._encode[key] | ||||
| data = ctx[f].data() | data = ctx[f].data() | ||||
| if (target == "to-lf" and "\r\n" in data | if (target == "to-lf" and "\r\n" in data | ||||
| or target == "to-crlf" and singlelf.search(data)): | or target == "to-crlf" and singlelf.search(data)): | ||||
| failed.append((f, target, str(ctx))) | failed.append((f, target, bytes(ctx))) | ||||
| break | break | ||||
| return failed | return failed | ||||
| def parseeol(ui, repo, nodes): | def parseeol(ui, repo, nodes): | ||||
| try: | try: | ||||
| for node in nodes: | for node in nodes: | ||||
| try: | try: | ||||
| if node is None: | if node is None: | ||||
| # instead? | # instead? | ||||
| self.ui.warn( | self.ui.warn( | ||||
| _("unsupported journal file version '%s'\n") % version) | _("unsupported journal file version '%s'\n") % version) | ||||
| return | return | ||||
| if not version: | if not version: | ||||
| # empty file, write version first | # empty file, write version first | ||||
| f.write(str(storageversion) + '\0') | f.write(str(storageversion) + '\0') | ||||
| f.seek(0, os.SEEK_END) | f.seek(0, os.SEEK_END) | ||||
| f.write(str(entry) + '\0') | f.write(bytes(entry) + '\0') | ||||
| def filtered(self, namespace=None, name=None): | def filtered(self, namespace=None, name=None): | ||||
| """Yield all journal entries with the given namespace or name | """Yield all journal entries with the given namespace or name | ||||
| Both the namespace and the name are optional; if neither is given all | Both the namespace and the name are optional; if neither is given all | ||||
| entries in the journal are produced. | entries in the journal are produced. | ||||
| Matching supports regular expressions by using the `re:` prefix | Matching supports regular expressions by using the `re:` prefix | ||||
| raise error.Abort(_("repo commit failed")) | raise error.Abort(_("repo commit failed")) | ||||
| try: | try: | ||||
| ph = patchheader(mergeq.join(patch), self.plainmode) | ph = patchheader(mergeq.join(patch), self.plainmode) | ||||
| except Exception: | except Exception: | ||||
| raise error.Abort(_("unable to read %s") % patch) | raise error.Abort(_("unable to read %s") % patch) | ||||
| diffopts = self.patchopts(diffopts, patch) | diffopts = self.patchopts(diffopts, patch) | ||||
| patchf = self.opener(patch, "w") | patchf = self.opener(patch, "w") | ||||
| comments = str(ph) | comments = bytes(ph) | ||||
| if comments: | if comments: | ||||
| patchf.write(comments) | patchf.write(comments) | ||||
| self.printdiff(repo, diffopts, head, n, fp=patchf) | self.printdiff(repo, diffopts, head, n, fp=patchf) | ||||
| patchf.close() | patchf.close() | ||||
| self.removeundo(repo) | self.removeundo(repo) | ||||
| return (0, n) | return (0, n) | ||||
| def qparents(self, repo, rev=None): | def qparents(self, repo, rev=None): | ||||