equal
deleted
inserted
replaced
1882 if any((outg, revs, freeargs, rules, editplan)): |
1882 if any((outg, revs, freeargs, rules, editplan)): |
1883 raise error.Abort(_(b'no arguments allowed with --abort')) |
1883 raise error.Abort(_(b'no arguments allowed with --abort')) |
1884 elif goal == b'edit-plan': |
1884 elif goal == b'edit-plan': |
1885 if any((outg, revs, freeargs)): |
1885 if any((outg, revs, freeargs)): |
1886 raise error.Abort( |
1886 raise error.Abort( |
1887 _(b'only --commands argument allowed with ' b'--edit-plan') |
1887 _(b'only --commands argument allowed with --edit-plan') |
1888 ) |
1888 ) |
1889 else: |
1889 else: |
1890 if state.inprogress(): |
1890 if state.inprogress(): |
1891 raise error.Abort( |
1891 raise error.Abort( |
1892 _( |
1892 _( |