equal
deleted
inserted
replaced
608 updatefunc(<repo>, <node>) |
608 updatefunc(<repo>, <node>) |
609 """ |
609 """ |
610 tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
610 tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
611 patch.extract(ui, hunk) |
611 patch.extract(ui, hunk) |
612 |
612 |
613 editor = getcommiteditor(editform='import.normal', **opts) |
|
614 update = not opts.get('bypass') |
613 update = not opts.get('bypass') |
615 strip = opts["strip"] |
614 strip = opts["strip"] |
616 sim = float(opts.get('similarity') or 0) |
615 sim = float(opts.get('similarity') or 0) |
617 if not tmpname: |
616 if not tmpname: |
618 return (None, None, False) |
617 return (None, None, False) |
686 # you are doing or used --exact or a merge patch while |
685 # you are doing or used --exact or a merge patch while |
687 # being updated to its first parent. |
686 # being updated to its first parent. |
688 m = None |
687 m = None |
689 else: |
688 else: |
690 m = scmutil.matchfiles(repo, files or []) |
689 m = scmutil.matchfiles(repo, files or []) |
|
690 editform = mergeeditform(repo[None], 'import.normal') |
|
691 editor = getcommiteditor(editform=editform, **opts) |
691 n = repo.commit(message, opts.get('user') or user, |
692 n = repo.commit(message, opts.get('user') or user, |
692 opts.get('date') or date, match=m, |
693 opts.get('date') or date, match=m, |
693 editor=editor, force=partial) |
694 editor=editor, force=partial) |
694 else: |
695 else: |
695 if opts.get('exact') or opts.get('import_branch'): |
696 if opts.get('exact') or opts.get('import_branch'): |