equal
deleted
inserted
replaced
2013 # commit(), 1 if nothing changed or None on success. |
2013 # commit(), 1 if nothing changed or None on success. |
2014 return 1 if ret == 0 else ret |
2014 return 1 if ret == 0 else ret |
2015 |
2015 |
2016 opts = pycompat.byteskwargs(opts) |
2016 opts = pycompat.byteskwargs(opts) |
2017 if opts.get(b'subrepos'): |
2017 if opts.get(b'subrepos'): |
2018 if opts.get(b'amend'): |
2018 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend']) |
2019 raise error.Abort(_(b'cannot amend with --subrepos')) |
|
2020 # Let --subrepos on the command line override config setting. |
2019 # Let --subrepos on the command line override config setting. |
2021 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') |
2020 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') |
2022 |
2021 |
2023 cmdutil.checkunfinished(repo, commit=True) |
2022 cmdutil.checkunfinished(repo, commit=True) |
2024 |
2023 |