Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 17932:c8ffde272653

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Augie Fackler <raf@durin42.com>
date Tue, 13 Nov 2012 19:32:53 -0600
parents 7f5dab94e48c 45bd0cd7ca04
children 54f063acc5ea
comparison
equal deleted inserted replaced
17930:7788b5e7d9ef 17932:c8ffde272653
1713 except KeyError: 1713 except KeyError:
1714 raise IOError 1714 raise IOError
1715 1715
1716 user = opts.get('user') or old.user() 1716 user = opts.get('user') or old.user()
1717 date = opts.get('date') or old.date() 1717 date = opts.get('date') or old.date()
1718 editmsg = False
1718 if not message: 1719 if not message:
1720 editmsg = True
1719 message = old.description() 1721 message = old.description()
1720 1722
1721 pureextra = extra.copy() 1723 pureextra = extra.copy()
1722 extra['amend_source'] = old.hex() 1724 extra['amend_source'] = old.hex()
1723 1725
1727 files=files, 1729 files=files,
1728 filectxfn=filectxfn, 1730 filectxfn=filectxfn,
1729 user=user, 1731 user=user,
1730 date=date, 1732 date=date,
1731 extra=extra) 1733 extra=extra)
1732 new._text = commitforceeditor(repo, new, []) 1734 if editmsg:
1735 new._text = commitforceeditor(repo, new, [])
1733 1736
1734 newdesc = changelog.stripdesc(new.description()) 1737 newdesc = changelog.stripdesc(new.description())
1735 if ((not node) 1738 if ((not node)
1736 and newdesc == old.description() 1739 and newdesc == old.description()
1737 and user == old.user() 1740 and user == old.user()