Show More
@@ -309,6 +309,7 def foreground(repo, nodes): | |||||
309 | EFFECTFLAGFIELD = "ef1" |
|
309 | EFFECTFLAGFIELD = "ef1" | |
310 |
|
310 | |||
311 | DESCCHANGED = 1 << 0 # action changed the description |
|
311 | DESCCHANGED = 1 << 0 # action changed the description | |
|
312 | PARENTCHANGED = 1 << 2 # action change the parent | |||
312 | USERCHANGED = 1 << 4 # the user changed |
|
313 | USERCHANGED = 1 << 4 # the user changed | |
313 | DATECHANGED = 1 << 5 # the date changed |
|
314 | DATECHANGED = 1 << 5 # the date changed | |
314 | BRANCHCHANGED = 1 << 6 # the branch changed |
|
315 | BRANCHCHANGED = 1 << 6 # the branch changed | |
@@ -338,6 +339,10 def geteffectflag(relation): | |||||
338 | if changectx.branch() != source.branch(): |
|
339 | if changectx.branch() != source.branch(): | |
339 | effects |= BRANCHCHANGED |
|
340 | effects |= BRANCHCHANGED | |
340 |
|
341 | |||
|
342 | # Check if at least one of the parent has changed | |||
|
343 | if changectx.parents() != source.parents(): | |||
|
344 | effects |= PARENTCHANGED | |||
|
345 | ||||
341 | return effects |
|
346 | return effects | |
342 |
|
347 | |||
343 | def getobsoleted(repo, tr): |
|
348 | def getobsoleted(repo, tr): |
@@ -81,7 +81,7 rebase (parents change) | |||||
81 | check result |
|
81 | check result | |
82 |
|
82 | |||
83 | $ hg debugobsolete --rev . |
|
83 | $ hg debugobsolete --rev . | |
84 |
c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': ' |
|
84 | c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} | |
85 |
|
85 | |||
86 | amend touching the diff |
|
86 | amend touching the diff | |
87 | ----------------------- |
|
87 | ----------------------- | |
@@ -150,7 +150,7 rebase not touching the diff | |||||
150 | rebasing 17:b57fed8d8322 "H1" |
|
150 | rebasing 17:b57fed8d8322 "H1" | |
151 | merging H0 |
|
151 | merging H0 | |
152 | $ hg debugobsolete -r tip |
|
152 | $ hg debugobsolete -r tip | |
153 |
b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': ' |
|
153 | b57fed8d83228a8ae3748d8c3760a77638dd4f8c e509e2eb3df5d131ff7c02350bf2a9edd0c09478 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} | |
154 |
|
154 | |||
155 | amend closing the branch should be detected as meta change |
|
155 | amend closing the branch should be detected as meta change | |
156 | ---------------------------------------------------------- |
|
156 | ---------------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now