Show More
@@ -870,8 +870,8 b' def tryimportone(ui, repo, hunk, parents' | |||
|
870 | 870 | extractdata = patch.extract(ui, hunk) |
|
871 | 871 | tmpname = extractdata.get('filename') |
|
872 | 872 | message = extractdata.get('message') |
|
873 | user = extractdata.get('user') | |
|
874 | date = extractdata.get('date') | |
|
873 | user = opts.get('user') or extractdata.get('user') | |
|
874 | date = opts.get('date') or extractdata.get('date') | |
|
875 | 875 | branch = extractdata.get('branch') |
|
876 | 876 | nodeid = extractdata.get('nodeid') |
|
877 | 877 | p1 = extractdata.get('p1') |
@@ -969,8 +969,8 b' def tryimportone(ui, repo, hunk, parents' | |||
|
969 | 969 | try: |
|
970 | 970 | if partial: |
|
971 | 971 | repo.ui.setconfig('ui', 'allowemptycommit', True) |
|
972 |
n = repo.commit(message, |
|
|
973 |
|
|
|
972 | n = repo.commit(message, user, | |
|
973 | date, match=m, | |
|
974 | 974 | editor=editor, extra=extra) |
|
975 | 975 | for idfunc in extrapostimport: |
|
976 | 976 | extrapostimportmap[idfunc](repo[n]) |
@@ -995,8 +995,8 b' def tryimportone(ui, repo, hunk, parents' | |||
|
995 | 995 | editor = getcommiteditor(editform='import.bypass') |
|
996 | 996 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
997 | 997 | message, |
|
998 |
|
|
|
999 |
|
|
|
998 | user, | |
|
999 | date, | |
|
1000 | 1000 | branch, files, store, |
|
1001 | 1001 | editor=editor) |
|
1002 | 1002 | n = memctx.commit() |
General Comments 0
You need to be logged in to leave comments.
Login now