Show More
@@ -310,6 +310,7 EFFECTFLAGFIELD = "ef1" | |||||
310 |
|
310 | |||
311 | DESCCHANGED = 1 << 0 # action changed the description |
|
311 | DESCCHANGED = 1 << 0 # action changed the description | |
312 | USERCHANGED = 1 << 4 # the user changed |
|
312 | USERCHANGED = 1 << 4 # the user changed | |
|
313 | DATECHANGED = 1 << 5 # the date changed | |||
313 |
|
314 | |||
314 | def geteffectflag(relation): |
|
315 | def geteffectflag(relation): | |
315 | """ From an obs-marker relation, compute what changed between the |
|
316 | """ From an obs-marker relation, compute what changed between the | |
@@ -328,6 +329,10 def geteffectflag(relation): | |||||
328 | if changectx.user() != source.user(): |
|
329 | if changectx.user() != source.user(): | |
329 | effects |= USERCHANGED |
|
330 | effects |= USERCHANGED | |
330 |
|
331 | |||
|
332 | # Check if date has changed | |||
|
333 | if changectx.date() != source.date(): | |||
|
334 | effects |= DATECHANGED | |||
|
335 | ||||
331 | return effects |
|
336 | return effects | |
332 |
|
337 | |||
333 | def getobsoleted(repo, tr): |
|
338 | def getobsoleted(repo, tr): |
@@ -51,7 +51,7 amend touching the date only | |||||
51 | check result |
|
51 | check result | |
52 |
|
52 | |||
53 | $ hg debugobsolete --rev . |
|
53 | $ hg debugobsolete --rev . | |
54 |
2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': ' |
|
54 | 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'} | |
55 |
|
55 | |||
56 | amend touching the branch only |
|
56 | amend touching the branch only | |
57 | ---------------------------- |
|
57 | ---------------------------- | |
@@ -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': '49', '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