Show More
@@ -971,20 +971,18 b' def tryimportone(ui, repo, hunk, parents' | |||
|
971 | 971 | editor = None |
|
972 | 972 | else: |
|
973 | 973 | editor = getcommiteditor(editform=editform, **opts) |
|
974 | allowemptyback = repo.ui.backupconfig('ui', 'allowemptycommit') | |
|
975 | 974 | extra = {} |
|
976 | 975 | for idfunc in extrapreimport: |
|
977 | 976 | extrapreimportmap[idfunc](repo, extractdata, extra, opts) |
|
978 |
|
|
|
977 | overrides = {} | |
|
979 | 978 |
|
|
980 |
|
|
|
979 | overrides[('ui', 'allowemptycommit')] = True | |
|
980 | with repo.ui.configoverride(overrides, 'import'): | |
|
981 | 981 | n = repo.commit(message, user, |
|
982 | 982 | date, match=m, |
|
983 | 983 | editor=editor, extra=extra) |
|
984 | 984 | for idfunc in extrapostimport: |
|
985 | 985 | extrapostimportmap[idfunc](repo[n]) |
|
986 | finally: | |
|
987 | repo.ui.restoreconfig(allowemptyback) | |
|
988 | 986 | else: |
|
989 | 987 | if opts.get('exact') or importbranch: |
|
990 | 988 | branch = branch or 'default' |
General Comments 0
You need to be logged in to leave comments.
Login now