44 # list of new nodes created by ongoing graft |
44 # list of new nodes created by ongoing graft |
45 statedata[b'newnodes'] = [] |
45 statedata[b'newnodes'] = [] |
46 |
46 |
47 # argument incompatible with followup from an interrupted operation |
47 # argument incompatible with followup from an interrupted operation |
48 commit_args = ['edit', 'log', 'user', 'date', 'currentdate', 'currentuser'] |
48 commit_args = ['edit', 'log', 'user', 'date', 'currentdate', 'currentuser'] |
49 nofollow_args = commit_args + ['rev'] |
49 nofollow_args = commit_args + ['base', 'rev'] |
50 |
50 |
51 arg_compatibilities = [ |
51 arg_compatibilities = [ |
52 ('no_commit', commit_args), |
52 ('no_commit', commit_args), |
53 ('stop', nofollow_args), |
53 ('stop', nofollow_args), |
54 ('abort', nofollow_args), |
54 ('abort', nofollow_args), |