Mercurial > hg-stable
changeset 34420:fa26f5891e68
effectflag: detect when parents changed
Store in effect flag when the parents changed between the predecessor and
its successors.
It can happens with "hg rebase" or "hg grab".
Differential Revision: https://phab.mercurial-scm.org/D539
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 06 Jul 2017 14:56:16 +0200 |
| parents | 57980af73cfa |
| children | 95759620d492 |
| files | mercurial/obsutil.py tests/test-obsmarkers-effectflag.t |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/obsutil.py Thu Jul 06 14:55:12 2017 +0200 +++ b/mercurial/obsutil.py Thu Jul 06 14:56:16 2017 +0200 @@ -309,6 +309,7 @@ EFFECTFLAGFIELD = "ef1" DESCCHANGED = 1 << 0 # action changed the description +PARENTCHANGED = 1 << 2 # action change the parent USERCHANGED = 1 << 4 # the user changed DATECHANGED = 1 << 5 # the date changed BRANCHCHANGED = 1 << 6 # the branch changed @@ -338,6 +339,10 @@ if changectx.branch() != source.branch(): effects |= BRANCHCHANGED + # Check if at least one of the parent has changed + if changectx.parents() != source.parents(): + effects |= PARENTCHANGED + return effects def getobsoleted(repo, tr):
--- a/tests/test-obsmarkers-effectflag.t Thu Jul 06 14:55:12 2017 +0200 +++ b/tests/test-obsmarkers-effectflag.t Thu Jul 06 14:56:16 2017 +0200 @@ -81,7 +81,7 @@ check result $ hg debugobsolete --rev . - c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} + c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} amend touching the diff ----------------------- @@ -150,7 +150,7 @@ rebasing 17:b57fed8d8322 "H1" merging H0 $ hg debugobsolete -r tip - b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} + b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} amend closing the branch should be detected as meta change ----------------------------------------------------------