equal
deleted
inserted
replaced
2391 # a dict of data to be stored in state file |
2391 # a dict of data to be stored in state file |
2392 statedata = {} |
2392 statedata = {} |
2393 # list of new nodes created by ongoing graft |
2393 # list of new nodes created by ongoing graft |
2394 statedata['newnodes'] = [] |
2394 statedata['newnodes'] = [] |
2395 |
2395 |
|
2396 if opts.get('user') and opts.get('currentuser'): |
|
2397 raise error.Abort(_('--user and --currentuser are mutually exclusive')) |
|
2398 if opts.get('date') and opts.get('currentdate'): |
|
2399 raise error.Abort(_('--date and --currentdate are mutually exclusive')) |
2396 if not opts.get('user') and opts.get('currentuser'): |
2400 if not opts.get('user') and opts.get('currentuser'): |
2397 opts['user'] = ui.username() |
2401 opts['user'] = ui.username() |
2398 if not opts.get('date') and opts.get('currentdate'): |
2402 if not opts.get('date') and opts.get('currentdate'): |
2399 opts['date'] = "%d %d" % dateutil.makedate() |
2403 opts['date'] = "%d %d" % dateutil.makedate() |
2400 |
2404 |