Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 17863:034e55bbf7c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: fix incompatibity between logfile and message option (issue3675) Bug introduced by 9732473aa24b
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 24 Oct 2012 15:37:32 +0200
parents 578fcc22b469
children 8f85151ce201
comparison
equal deleted inserted replaced
17862:2142691be14f 17863:034e55bbf7c0
1609 tr = repo.transaction('amend') 1609 tr = repo.transaction('amend')
1610 try: 1610 try:
1611 # See if we got a message from -m or -l, if not, open the editor 1611 # See if we got a message from -m or -l, if not, open the editor
1612 # with the message of the changeset to amend 1612 # with the message of the changeset to amend
1613 message = logmessage(ui, opts) 1613 message = logmessage(ui, opts)
1614 # ensure logfile does not conflict with later enforcement of the
1615 # message. potential logfile content has been processed by
1616 # `logmessage` anyway.
1617 opts.pop('logfile')
1614 # First, do a regular commit to record all changes in the working 1618 # First, do a regular commit to record all changes in the working
1615 # directory (if there are any) 1619 # directory (if there are any)
1616 ui.callhooks = False 1620 ui.callhooks = False
1617 try: 1621 try:
1618 opts['message'] = 'temporary amend commit for %s' % old 1622 opts['message'] = 'temporary amend commit for %s' % old