Show More
@@ -308,6 +308,8 def foreground(repo, nodes): | |||||
308 | # logic around storing and using effect flags |
|
308 | # logic around storing and using effect flags | |
309 | EFFECTFLAGFIELD = "ef1" |
|
309 | EFFECTFLAGFIELD = "ef1" | |
310 |
|
310 | |||
|
311 | DESCCHANGED = 1 << 0 # action changed the description | |||
|
312 | ||||
311 | def geteffectflag(relation): |
|
313 | def geteffectflag(relation): | |
312 | """ From an obs-marker relation, compute what changed between the |
|
314 | """ From an obs-marker relation, compute what changed between the | |
313 | predecessor and the successor. |
|
315 | predecessor and the successor. | |
@@ -316,6 +318,11 def geteffectflag(relation): | |||||
316 |
|
318 | |||
317 | source = relation[0] |
|
319 | source = relation[0] | |
318 |
|
320 | |||
|
321 | for changectx in relation[1]: | |||
|
322 | # Check if description has changed | |||
|
323 | if changectx.description() != source.description(): | |||
|
324 | effects |= DESCCHANGED | |||
|
325 | ||||
319 | return effects |
|
326 | return effects | |
320 |
|
327 | |||
321 | def getobsoleted(repo, tr): |
|
328 | def getobsoleted(repo, tr): |
@@ -29,7 +29,7 amend touching the description only | |||||
29 | check result |
|
29 | check result | |
30 |
|
30 | |||
31 | $ hg debugobsolete --rev . |
|
31 | $ hg debugobsolete --rev . | |
32 |
471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': ' |
|
32 | 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
33 |
|
33 | |||
34 | amend touching the user only |
|
34 | amend touching the user only | |
35 | ---------------------------- |
|
35 | ---------------------------- | |
@@ -106,7 +106,7 amend with multiple effect (desc and met | |||||
106 | check result |
|
106 | check result | |
107 |
|
107 | |||
108 | $ hg debugobsolete --rev . |
|
108 | $ hg debugobsolete --rev . | |
109 |
fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': ' |
|
109 | fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} | |
110 |
|
110 | |||
111 | rebase not touching the diff |
|
111 | rebase not touching the diff | |
112 | ---------------------------- |
|
112 | ---------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now