equal
deleted
inserted
replaced
62 util, |
62 util, |
63 wireprotoserver, |
63 wireprotoserver, |
64 ) |
64 ) |
65 from .utils import ( |
65 from .utils import ( |
66 dateutil, |
66 dateutil, |
67 procutil, |
|
68 stringutil, |
67 stringutil, |
69 ) |
68 ) |
70 |
69 |
71 release = lockmod.release |
70 release = lockmod.release |
72 |
71 |
2363 nodes = [repo[rev].hex() for rev in revs[pos:]] |
2362 nodes = [repo[rev].hex() for rev in revs[pos:]] |
2364 statedata['nodes'] = nodes |
2363 statedata['nodes'] = nodes |
2365 stateversion = 1 |
2364 stateversion = 1 |
2366 graftstate.save(stateversion, statedata) |
2365 graftstate.save(stateversion, statedata) |
2367 extra = '' |
2366 extra = '' |
2368 if opts.get('user'): |
|
2369 extra += ' --user %s' % procutil.shellquote(opts['user']) |
|
2370 if opts.get('date'): |
|
2371 extra += ' --date %s' % procutil.shellquote(opts['date']) |
|
2372 if opts.get('log'): |
2367 if opts.get('log'): |
2373 extra += ' --log' |
2368 extra += ' --log' |
2374 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
2369 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
2375 raise error.Abort( |
2370 raise error.Abort( |
2376 _("unresolved conflicts, can't continue"), |
2371 _("unresolved conflicts, can't continue"), |