Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 48946:642e31cb55f0
py3: use class X: instead of class X(object):
The inheritance from object is implied in Python 3. So this should
be equivalent.
This change was generated via an automated search and replace. So there
may have been some accidental changes.
Differential Revision: https://phab.mercurial-scm.org/D12352
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 21 Feb 2022 13:08:28 -0700 |
| parents | c17aee610bab |
| children | 2e726c934fcd |
comparison
equal
deleted
inserted
replaced
| 48945:55d132525155 | 48946:642e31cb55f0 |
|---|---|
| 64 and repo.dirstate.normalize(f) not in repo.dirstate | 64 and repo.dirstate.normalize(f) not in repo.dirstate |
| 65 and mctx[f2].cmp(wctx[f]) | 65 and mctx[f2].cmp(wctx[f]) |
| 66 ) | 66 ) |
| 67 | 67 |
| 68 | 68 |
| 69 class _unknowndirschecker(object): | 69 class _unknowndirschecker: |
| 70 """ | 70 """ |
| 71 Look for any unknown files or directories that may have a path conflict | 71 Look for any unknown files or directories that may have a path conflict |
| 72 with a file. If any path prefix of the file exists as a file or link, | 72 with a file. If any path prefix of the file exists as a file or link, |
| 73 then it conflicts. If the file itself is a directory that contains any | 73 then it conflicts. If the file itself is a directory that contains any |
| 74 file that is not tracked, then it conflicts. | 74 file that is not tracked, then it conflicts. |
| 535 else: | 535 else: |
| 536 msg = _(b'conflict in file \'%s\' is outside narrow clone') | 536 msg = _(b'conflict in file \'%s\' is outside narrow clone') |
| 537 raise error.StateError(msg % f) | 537 raise error.StateError(msg % f) |
| 538 | 538 |
| 539 | 539 |
| 540 class mergeresult(object): | 540 class mergeresult: |
| 541 """An object representing result of merging manifests. | 541 """An object representing result of merging manifests. |
| 542 | 542 |
| 543 It has information about what actions need to be performed on dirstate | 543 It has information about what actions need to be performed on dirstate |
| 544 mapping of divergent renames and other such cases.""" | 544 mapping of divergent renames and other such cases.""" |
| 545 | 545 |
| 1465 ], | 1465 ], |
| 1466 ) | 1466 ) |
| 1467 | 1467 |
| 1468 | 1468 |
| 1469 @attr.s(frozen=True) | 1469 @attr.s(frozen=True) |
| 1470 class updateresult(object): | 1470 class updateresult: |
| 1471 updatedcount = attr.ib() | 1471 updatedcount = attr.ib() |
| 1472 mergedcount = attr.ib() | 1472 mergedcount = attr.ib() |
| 1473 removedcount = attr.ib() | 1473 removedcount = attr.ib() |
| 1474 unresolvedcount = attr.ib() | 1474 unresolvedcount = attr.ib() |
| 1475 | 1475 |