Mercurial > hg-stable
changeset 17932:c8ffde272653
Merge with crew-stable.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Tue, 13 Nov 2012 19:32:53 -0600 |
| parents | 7788b5e7d9ef (current diff) 35ba170c0f82 (diff) |
| children | 8243dd66e0e3 |
| files | mercurial/cmdutil.py mercurial/commands.py |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Nov 13 13:09:42 2012 -0800 +++ b/mercurial/cmdutil.py Tue Nov 13 19:32:53 2012 -0600 @@ -1715,7 +1715,9 @@ user = opts.get('user') or old.user() date = opts.get('date') or old.date() + editmsg = False if not message: + editmsg = True message = old.description() pureextra = extra.copy() @@ -1729,7 +1731,8 @@ user=user, date=date, extra=extra) - new._text = commitforceeditor(repo, new, []) + if editmsg: + new._text = commitforceeditor(repo, new, []) newdesc = changelog.stripdesc(new.description()) if ((not node)
--- a/tests/test-commit-amend.t Tue Nov 13 13:09:42 2012 -0800 +++ b/tests/test-commit-amend.t Tue Nov 13 19:32:53 2012 -0600 @@ -29,9 +29,10 @@ > EOF Amending changeset with changes in working dir: +(and check that --message does not trigger an editor) $ echo a >> a - $ hg ci --amend -m 'amend base1' + $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1' pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149 43f1ba15f28a tip saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob) @@ -66,10 +67,11 @@ Remove file that was added in amended commit: (and test logfile option) +(and test that logfile option do not trigger an editor) $ hg rm b $ echo 'amend base1 remove new file' > ../logfile - $ hg ci --amend -l ../logfile + $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob) $ hg cat b