Show More
@@ -2082,6 +2082,7 b' def commit(ui, repo, *pats, **opts):' | |||||
2082 |
|
2082 | |||
2083 | hg commit --amend --date now |
|
2083 | hg commit --amend --date now | |
2084 | """ |
|
2084 | """ | |
|
2085 | cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend']) | |||
2085 | with repo.wlock(), repo.lock(): |
|
2086 | with repo.wlock(), repo.lock(): | |
2086 | return _docommit(ui, repo, *pats, **opts) |
|
2087 | return _docommit(ui, repo, *pats, **opts) | |
2087 |
|
2088 | |||
@@ -2097,7 +2098,6 b' def _docommit(ui, repo, *pats, **opts):' | |||||
2097 | return 1 if ret == 0 else ret |
|
2098 | return 1 if ret == 0 else ret | |
2098 |
|
2099 | |||
2099 | if opts.get('subrepos'): |
|
2100 | if opts.get('subrepos'): | |
2100 | cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend']) |
|
|||
2101 | # Let --subrepos on the command line override config setting. |
|
2101 | # Let --subrepos on the command line override config setting. | |
2102 | ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') |
|
2102 | ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') | |
2103 |
|
2103 |
General Comments 0
You need to be logged in to leave comments.
Login now