Mercurial > hg
comparison hgext/transplant.py @ 43642:96edd0c38740
transplant: use field names instead of field numbers on scmutil.status
As part of my pytype adventures I want to make scmutil.status no longer a
subclass of tuple. This is part of that process.
Differential Revision: https://phab.mercurial-scm.org/D7394
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 14 Nov 2019 15:25:57 -0500 |
parents | 9f70512ae2cf |
children | d50b4ad1d4a5 |
comparison
equal
deleted
inserted
replaced
43641:705738def50c | 43642:96edd0c38740 |
---|---|
441 _(b'working directory not at transplant parent %s') | 441 _(b'working directory not at transplant parent %s') |
442 % nodemod.hex(parent) | 442 % nodemod.hex(parent) |
443 ) | 443 ) |
444 if merge: | 444 if merge: |
445 repo.setparents(p1, parents[1]) | 445 repo.setparents(p1, parents[1]) |
446 modified, added, removed, deleted = repo.status()[:4] | 446 st = repo.status() |
447 modified, added, removed, deleted = ( | |
448 st.modified, | |
449 st.added, | |
450 st.removed, | |
451 st.deleted, | |
452 ) | |
447 if merge or modified or added or removed or deleted: | 453 if merge or modified or added or removed or deleted: |
448 n = repo.commit( | 454 n = repo.commit( |
449 message, | 455 message, |
450 user, | 456 user, |
451 date, | 457 date, |