equal
deleted
inserted
replaced
1272 if revf and basef: |
1272 if revf and basef: |
1273 raise error.Abort(_(b'cannot specify both a revision and a base')) |
1273 raise error.Abort(_(b'cannot specify both a revision and a base')) |
1274 if revf and srcf: |
1274 if revf and srcf: |
1275 raise error.Abort(_(b'cannot specify both a revision and a source')) |
1275 raise error.Abort(_(b'cannot specify both a revision and a source')) |
1276 |
1276 |
|
1277 cmdutil.checkunfinished(repo) |
1277 if not inmemory: |
1278 if not inmemory: |
1278 cmdutil.checkunfinished(repo) |
|
1279 cmdutil.bailifchanged(repo) |
1279 cmdutil.bailifchanged(repo) |
1280 |
1280 |
1281 if ui.configbool(b'commands', b'rebase.requiredest') and not destf: |
1281 if ui.configbool(b'commands', b'rebase.requiredest') and not destf: |
1282 raise error.Abort( |
1282 raise error.Abort( |
1283 _(b'you must specify a destination'), |
1283 _(b'you must specify a destination'), |