##// END OF EJS Templates
amend: use "editor" argument for "memctx.__init__" to save commit message...
FUJIWARA Katsunori -
r21240:1a833fcf default
parent child Browse files
Show More
@@ -2045,12 +2045,12 b' def amend(ui, repo, commitfunc, old, ext'
2045
2045
2046 user = opts.get('user') or old.user()
2046 user = opts.get('user') or old.user()
2047 date = opts.get('date') or old.date()
2047 date = opts.get('date') or old.date()
2048 editmsg = False
2048 editor = commiteditor
2049 if not message:
2049 if not message:
2050 editmsg = True
2050 editor = commitforceeditor
2051 message = old.description()
2051 message = old.description()
2052 elif opts.get('edit'):
2052 elif opts.get('edit'):
2053 editmsg = True
2053 editor = commitforceeditor
2054
2054
2055 pureextra = extra.copy()
2055 pureextra = extra.copy()
2056 extra['amend_source'] = old.hex()
2056 extra['amend_source'] = old.hex()
@@ -2062,10 +2062,8 b' def amend(ui, repo, commitfunc, old, ext'
2062 filectxfn=filectxfn,
2062 filectxfn=filectxfn,
2063 user=user,
2063 user=user,
2064 date=date,
2064 date=date,
2065 extra=extra)
2065 extra=extra,
2066 if editmsg:
2066 editor=editor)
2067 new._text = commitforceeditor(repo, new, [])
2068 repo.savecommitmessage(new.description())
2069
2067
2070 newdesc = changelog.stripdesc(new.description())
2068 newdesc = changelog.stripdesc(new.description())
2071 if ((not node)
2069 if ((not node)
General Comments 0
You need to be logged in to leave comments. Login now