| pulkit |
| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
Thanks for this. I installed black now, so I hope I will catch these next time before pushing changes.
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/fuzz/mpatch_corpus.py (6 lines) | |||
| M | mercurial/cmdutil.py (24 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| c53e83a63511 | b7af8a02a304 | Martin von Zweigbergk | Dec 11 2019, 1:00 PM |
| ) | ) | ||||
| return b''.join(parts) | return b''.join(parts) | ||||
| with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf: | with zipfile.ZipFile(args.out[0], "w", zipfile.ZIP_STORED) as zf: | ||||
| # Manually constructed entries | # Manually constructed entries | ||||
| zf.writestr( | zf.writestr( | ||||
| "one_delta_applies", | "one_delta_applies", | ||||
| bytes(corpus(b'a', [delta([deltafrag(0, 1, b'b')])])) | bytes(corpus(b'a', [delta([deltafrag(0, 1, b'b')])])), | ||||
| ) | ) | ||||
| zf.writestr( | zf.writestr( | ||||
| "one_delta_starts_late", | "one_delta_starts_late", | ||||
| bytes(corpus(b'a', [delta([deltafrag(3, 1, b'b')])])) | bytes(corpus(b'a', [delta([deltafrag(3, 1, b'b')])])), | ||||
| ) | ) | ||||
| zf.writestr( | zf.writestr( | ||||
| "one_delta_ends_late", | "one_delta_ends_late", | ||||
| bytes(corpus(b'a', [delta([deltafrag(0, 20, b'b')])])) | bytes(corpus(b'a', [delta([deltafrag(0, 20, b'b')])])), | ||||
| ) | ) | ||||
| try: | try: | ||||
| # Generated from repo data | # Generated from repo data | ||||
| r = hg.repository(uimod.ui(), b'../..') | r = hg.repository(uimod.ui(), b'../..') | ||||
| fl = r.file(b'mercurial/manifest.py') | fl = r.file(b'mercurial/manifest.py') | ||||
| rl = getattr(fl, '_revlog', fl) | rl = getattr(fl, '_revlog', fl) | ||||
| bins = rl._chunks(rl._deltachain(10)[0]) | bins = rl._chunks(rl._deltachain(10)[0]) | ||||
| unresolvedpaths = attr.ib() | unresolvedpaths = attr.ib() | ||||
| _label = b'status.morestatus' | _label = b'status.morestatus' | ||||
| def formatfile(self, path, fm): | def formatfile(self, path, fm): | ||||
| if self.inmergestate and path in self.unresolvedpaths: | if self.inmergestate and path in self.unresolvedpaths: | ||||
| fm.data(unresolved=True) | fm.data(unresolved=True) | ||||
| def formatfooter(self, fm): | def formatfooter(self, fm): | ||||
| statemsg = _(b'The repository is in an unfinished *%s* state.' | statemsg = ( | ||||
| ) % self.unfinishedop | _(b'The repository is in an unfinished *%s* state.') | ||||
| % self.unfinishedop | |||||
| ) | |||||
| fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) | fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) | ||||
| self._formatconflicts(fm) | self._formatconflicts(fm) | ||||
| if self.unfinishedmsg: | if self.unfinishedmsg: | ||||
| fm.plain(b'%s\n' % _commentlines(self.unfinishedmsg), | fm.plain( | ||||
| label=self._label) | b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label | ||||
| ) | |||||
| def _formatconflicts(self, fm): | def _formatconflicts(self, fm): | ||||
| if not self.inmergestate: | if not self.inmergestate: | ||||
| return | return | ||||
| if self.unresolvedpaths: | if self.unresolvedpaths: | ||||
| mergeliststr = b'\n'.join( | mergeliststr = b'\n'.join( | ||||
| [ | [ | ||||
| b' %s' % util.pathto(self.reporoot, encoding.getcwd(), | b' %s' | ||||
| path) | % util.pathto(self.reporoot, encoding.getcwd(), path) | ||||
| for path in self.unresolvedpaths | for path in self.unresolvedpaths | ||||
| ] | ] | ||||
| ) | ) | ||||
| msg = ( | msg = ( | ||||
| _( | _( | ||||
| '''Unresolved merge conflicts: | '''Unresolved merge conflicts: | ||||
| %s | %s | ||||
| if not statetuple: | if not statetuple: | ||||
| return None | return None | ||||
| unfinishedop, unfinishedmsg = statetuple | unfinishedop, unfinishedmsg = statetuple | ||||
| mergestate = mergemod.mergestate.read(repo) | mergestate = mergemod.mergestate.read(repo) | ||||
| unresolved = None | unresolved = None | ||||
| if mergestate.active(): | if mergestate.active(): | ||||
| unresolved = sorted(mergestate.unresolved()) | unresolved = sorted(mergestate.unresolved()) | ||||
| return morestatus(repo.root, unfinishedop, unfinishedmsg, | return morestatus( | ||||
| unresolved is not None, unresolved) | repo.root, | ||||
| unfinishedop, | |||||
| unfinishedmsg, | |||||
| unresolved is not None, | |||||
| unresolved, | |||||
| ) | |||||
| def findpossible(cmd, table, strict=False): | def findpossible(cmd, table, strict=False): | ||||
| """ | """ | ||||
| Return cmd -> (aliases, command table entry) | Return cmd -> (aliases, command table entry) | ||||
| for each matching command. | for each matching command. | ||||
| Return debug commands (or their aliases) only if no normal command matches. | Return debug commands (or their aliases) only if no normal command matches. | ||||
| """ | """ | ||||