Show More
@@ -610,7 +610,6 b' def tryimportone(ui, repo, hunk, parents' | |||||
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) | |
@@ -688,6 +687,8 b' def tryimportone(ui, repo, hunk, parents' | |||||
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) |
@@ -406,7 +406,8 b' messages for each actions.' | |||||
406 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` |
|
406 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` | |
407 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` |
|
407 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` | |
408 | - ``changeset.import.bypass`` for :hg:`import --bypass` |
|
408 | - ``changeset.import.bypass`` for :hg:`import --bypass` | |
409 |
- ``changeset.import.normal`` for :hg:`import` |
|
409 | - ``changeset.import.normal.merge`` for :hg:`import` on merges | |
|
410 | - ``changeset.import.normal.normal`` for :hg:`import` on other | |||
410 | - ``changeset.mq.qnew`` for :hg:`qnew` |
|
411 | - ``changeset.mq.qnew`` for :hg:`qnew` | |
411 | - ``changeset.mq.qfold`` for :hg:`qfold` |
|
412 | - ``changeset.mq.qfold`` for :hg:`qfold` | |
412 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` |
|
413 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` |
@@ -30,6 +30,7 b' Test import and merge diffs' | |||||
30 | (branch merge, don't forget to commit) |
|
30 | (branch merge, don't forget to commit) | |
31 | $ hg ci -m merge |
|
31 | $ hg ci -m merge | |
32 | $ hg export . > ../merge.diff |
|
32 | $ hg export . > ../merge.diff | |
|
33 | $ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff | |||
33 | $ cd .. |
|
34 | $ cd .. | |
34 | $ hg clone -r2 repo repo2 |
|
35 | $ hg clone -r2 repo repo2 | |
35 | adding changesets |
|
36 | adding changesets | |
@@ -52,8 +53,13 b' Test without --exact and diff.p1 == work' | |||||
52 |
|
53 | |||
53 | $ hg up 1 |
|
54 | $ hg up 1 | |
54 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
55 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
55 | $ hg import ../merge.diff |
|
56 | $ cat > $TESTTMP/editor.sh <<EOF | |
56 | applying ../merge.diff |
|
57 | > env | grep HGEDITFORM | |
|
58 | > echo merge > \$1 | |||
|
59 | > EOF | |||
|
60 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff | |||
|
61 | applying ../merge.nomsg.diff | |||
|
62 | HGEDITFORM=import.normal.merge | |||
57 | $ tipparents |
|
63 | $ tipparents | |
58 | 1:540395c44225 changea |
|
64 | 1:540395c44225 changea | |
59 | 3:102a90ea7b4a addb |
|
65 | 3:102a90ea7b4a addb |
@@ -90,8 +90,13 b" the commit message, regardless of '--edi" | |||||
90 | added 1 changesets with 2 changes to 2 files |
|
90 | added 1 changesets with 2 changes to 2 files | |
91 | updating to branch default |
|
91 | updating to branch default | |
92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
92 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
93 | $ HGEDITOR=cat hg --cwd b import ../diffed-tip.patch |
|
93 | $ cat > $TESTTMP/editor.sh <<EOF | |
|
94 | > env | grep HGEDITFORM | |||
|
95 | > cat \$1 | |||
|
96 | > EOF | |||
|
97 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg --cwd b import ../diffed-tip.patch | |||
94 | applying ../diffed-tip.patch |
|
98 | applying ../diffed-tip.patch | |
|
99 | HGEDITFORM=import.normal.normal | |||
95 |
|
100 | |||
96 |
|
101 | |||
97 |
|
|
102 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
General Comments 0
You need to be logged in to leave comments.
Login now