equal
deleted
inserted
replaced
868 # avoid cycle context -> subrepo -> cmdutil |
868 # avoid cycle context -> subrepo -> cmdutil |
869 import context |
869 import context |
870 extractdata = patch.extract(ui, hunk) |
870 extractdata = patch.extract(ui, hunk) |
871 tmpname = extractdata.get('filename') |
871 tmpname = extractdata.get('filename') |
872 message = extractdata.get('message') |
872 message = extractdata.get('message') |
873 user = extractdata.get('user') |
873 user = opts.get('user') or extractdata.get('user') |
874 date = extractdata.get('date') |
874 date = opts.get('date') or extractdata.get('date') |
875 branch = extractdata.get('branch') |
875 branch = extractdata.get('branch') |
876 nodeid = extractdata.get('nodeid') |
876 nodeid = extractdata.get('nodeid') |
877 p1 = extractdata.get('p1') |
877 p1 = extractdata.get('p1') |
878 p2 = extractdata.get('p2') |
878 p2 = extractdata.get('p2') |
879 |
879 |
967 for idfunc in extrapreimport: |
967 for idfunc in extrapreimport: |
968 extrapreimportmap[idfunc](repo, extractdata, extra, opts) |
968 extrapreimportmap[idfunc](repo, extractdata, extra, opts) |
969 try: |
969 try: |
970 if partial: |
970 if partial: |
971 repo.ui.setconfig('ui', 'allowemptycommit', True) |
971 repo.ui.setconfig('ui', 'allowemptycommit', True) |
972 n = repo.commit(message, opts.get('user') or user, |
972 n = repo.commit(message, user, |
973 opts.get('date') or date, match=m, |
973 date, match=m, |
974 editor=editor, extra=extra) |
974 editor=editor, extra=extra) |
975 for idfunc in extrapostimport: |
975 for idfunc in extrapostimport: |
976 extrapostimportmap[idfunc](repo[n]) |
976 extrapostimportmap[idfunc](repo[n]) |
977 finally: |
977 finally: |
978 repo.ui.restoreconfig(allowemptyback) |
978 repo.ui.restoreconfig(allowemptyback) |
993 editor = None |
993 editor = None |
994 else: |
994 else: |
995 editor = getcommiteditor(editform='import.bypass') |
995 editor = getcommiteditor(editform='import.bypass') |
996 memctx = context.makememctx(repo, (p1.node(), p2.node()), |
996 memctx = context.makememctx(repo, (p1.node(), p2.node()), |
997 message, |
997 message, |
998 opts.get('user') or user, |
998 user, |
999 opts.get('date') or date, |
999 date, |
1000 branch, files, store, |
1000 branch, files, store, |
1001 editor=editor) |
1001 editor=editor) |
1002 n = memctx.commit() |
1002 n = memctx.commit() |
1003 finally: |
1003 finally: |
1004 store.close() |
1004 store.close() |