##// END OF EJS Templates
effectflag: detect when user changed...
Boris Feld -
r34417:55ef17ec default
parent child Browse files
Show More
@@ -309,6 +309,7 b' 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 USERCHANGED = 1 << 4 # the user changed
312
313
313 def geteffectflag(relation):
314 def geteffectflag(relation):
314 """ From an obs-marker relation, compute what changed between the
315 """ From an obs-marker relation, compute what changed between the
@@ -323,6 +324,10 b' def geteffectflag(relation):'
323 if changectx.description() != source.description():
324 if changectx.description() != source.description():
324 effects |= DESCCHANGED
325 effects |= DESCCHANGED
325
326
327 # Check if user has changed
328 if changectx.user() != source.user():
329 effects |= USERCHANGED
330
326 return effects
331 return effects
327
332
328 def getobsoleted(repo, tr):
333 def getobsoleted(repo, tr):
@@ -40,7 +40,7 b' amend touching the user only'
40 check result
40 check result
41
41
42 $ hg debugobsolete --rev .
42 $ hg debugobsolete --rev .
43 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'amend', 'user': 'test'}
43 ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'}
44
44
45 amend touching the date only
45 amend touching the date only
46 ----------------------------
46 ----------------------------
@@ -106,7 +106,7 b' 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': '1', 'operation': 'amend', 'user': 'test'}
109 fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '17', '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