Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/debugcommands.py @ 52667:73ab542565e0
pyupgrade: run the `unpack_list_comprehension` fixer
This probably doesn't matter much, but it reduces the noise when running the
tool in the future.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 05 Jan 2025 22:12:02 -0500 |
| parents | 0e11e532c958 |
| children | d903647abbd3 |
comparison
equal
deleted
inserted
replaced
| 52666:9bd6854aab86 | 52667:73ab542565e0 |
|---|---|
| 275 fn = b"mf" | 275 fn = b"mf" |
| 276 p1 = repo[ps[0]] | 276 p1 = repo[ps[0]] |
| 277 if len(ps) > 1: | 277 if len(ps) > 1: |
| 278 p2 = repo[ps[1]] | 278 p2 = repo[ps[1]] |
| 279 pa = p1.ancestor(p2) | 279 pa = p1.ancestor(p2) |
| 280 base, local, other = [ | 280 base, local, other = ( |
| 281 x[fn].data() for x in (pa, p1, p2) | 281 x[fn].data() for x in (pa, p1, p2) |
| 282 ] | 282 ) |
| 283 m3 = simplemerge.Merge3Text( | 283 m3 = simplemerge.Merge3Text( |
| 284 base, | 284 base, |
| 285 local, | 285 local, |
| 286 other, | 286 other, |
| 287 relaxed_sync=merge_relaxed_sync, | 287 relaxed_sync=merge_relaxed_sync, |