equal
deleted
inserted
replaced
361 def finishfold(ui, repo, ctx, oldctx, newnode, opts, internalchanges): |
361 def finishfold(ui, repo, ctx, oldctx, newnode, opts, internalchanges): |
362 parent = ctx.parents()[0].node() |
362 parent = ctx.parents()[0].node() |
363 hg.update(repo, parent) |
363 hg.update(repo, parent) |
364 ### prepare new commit data |
364 ### prepare new commit data |
365 commitopts = opts.copy() |
365 commitopts = opts.copy() |
366 # username |
366 commitopts['user'] = ctx.user() |
367 if ctx.user() == oldctx.user(): |
|
368 username = ctx.user() |
|
369 else: |
|
370 username = ui.username() |
|
371 commitopts['user'] = username |
|
372 # commit message |
367 # commit message |
373 if opts.get('rollup'): |
368 if opts.get('rollup'): |
374 newmessage = ctx.description() |
369 newmessage = ctx.description() |
375 else: |
370 else: |
376 newmessage = '\n***\n'.join( |
371 newmessage = '\n***\n'.join( |