Show More
@@ -1209,12 +1209,12 b' def commit(ui, repo, commitfunc, pats, o' | |||||
1209 |
|
1209 | |||
1210 | return commitfunc(ui, repo, message, match(repo, pats, opts), opts) |
|
1210 | return commitfunc(ui, repo, message, match(repo, pats, opts), opts) | |
1211 |
|
1211 | |||
1212 | def commiteditor(repo, ctx): |
|
1212 | def commiteditor(repo, ctx, subs): | |
1213 | if ctx.description(): |
|
1213 | if ctx.description(): | |
1214 | return ctx.description() |
|
1214 | return ctx.description() | |
1215 | return commitforceeditor(repo, ctx) |
|
1215 | return commitforceeditor(repo, ctx, subs) | |
1216 |
|
1216 | |||
1217 | def commitforceeditor(repo, ctx): |
|
1217 | def commitforceeditor(repo, ctx, subs): | |
1218 | edittext = [] |
|
1218 | edittext = [] | |
1219 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() |
|
1219 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() | |
1220 | if ctx.description(): |
|
1220 | if ctx.description(): | |
@@ -1231,6 +1231,7 b' def commitforceeditor(repo, ctx):' | |||||
1231 | if ctx.branch(): |
|
1231 | if ctx.branch(): | |
1232 | edittext.append(_("HG: branch '%s'") |
|
1232 | edittext.append(_("HG: branch '%s'") | |
1233 | % encoding.tolocal(ctx.branch())) |
|
1233 | % encoding.tolocal(ctx.branch())) | |
|
1234 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) | |||
1234 | edittext.extend([_("HG: added %s") % f for f in added]) |
|
1235 | edittext.extend([_("HG: added %s") % f for f in added]) | |
1235 | edittext.extend([_("HG: changed %s") % f for f in modified]) |
|
1236 | edittext.extend([_("HG: changed %s") % f for f in modified]) | |
1236 | edittext.extend([_("HG: removed %s") % f for f in removed]) |
|
1237 | edittext.extend([_("HG: removed %s") % f for f in removed]) |
@@ -872,7 +872,7 b' class localrepository(repo.repository):' | |||||
872 | cctx = context.workingctx(self, (p1, p2), text, user, date, |
|
872 | cctx = context.workingctx(self, (p1, p2), text, user, date, | |
873 | extra, changes) |
|
873 | extra, changes) | |
874 | if editor: |
|
874 | if editor: | |
875 | cctx._text = editor(self, cctx) |
|
875 | cctx._text = editor(self, cctx, subs) | |
876 |
|
876 | |||
877 | # commit subs |
|
877 | # commit subs | |
878 | if subs: |
|
878 | if subs: |
General Comments 0
You need to be logged in to leave comments.
Login now