Show More
@@ -1436,11 +1436,14 b' def commit(ui, repo, *pats, **opts):' | |||||
1436 | try: |
|
1436 | try: | |
1437 | if opts.get('secret'): |
|
1437 | if opts.get('secret'): | |
1438 | ui.setconfig('phases', 'new-commit', 'secret') |
|
1438 | ui.setconfig('phases', 'new-commit', 'secret') | |
|
1439 | # Propagate to subrepos | |||
|
1440 | repo.baseui.setconfig('phases', 'new-commit', 'secret') | |||
1439 |
|
1441 | |||
1440 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1442 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
1441 | match, editor=e, extra=extra) |
|
1443 | match, editor=e, extra=extra) | |
1442 | finally: |
|
1444 | finally: | |
1443 | ui.setconfig('phases', 'new-commit', oldcommitphase) |
|
1445 | ui.setconfig('phases', 'new-commit', oldcommitphase) | |
|
1446 | repo.baseui.setconfig('phases', 'new-commit', oldcommitphase) | |||
1444 |
|
1447 | |||
1445 |
|
1448 | |||
1446 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1449 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
@@ -1294,3 +1294,18 b' configuration' | |||||
1294 | 15: secret |
|
1294 | 15: secret | |
1295 |
|
1295 | |||
1296 | $ cd .. |
|
1296 | $ cd .. | |
|
1297 | ||||
|
1298 | ||||
|
1299 | Test that comit --secret works on both repo and subrepo (issue4182) | |||
|
1300 | ||||
|
1301 | $ cd main | |||
|
1302 | $ echo secret >> b | |||
|
1303 | $ echo secret >> s/b | |||
|
1304 | $ hg commit --secret --subrepo -m "secret" | |||
|
1305 | committing subrepository s | |||
|
1306 | $ hg phase -r . | |||
|
1307 | 6: secret | |||
|
1308 | $ cd s | |||
|
1309 | $ hg phase -r . | |||
|
1310 | 6: secret | |||
|
1311 | $ cd ../../ |
General Comments 0
You need to be logged in to leave comments.
Login now