equal
deleted
inserted
replaced
1428 if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'): |
1428 if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'): |
1429 return None |
1429 return None |
1430 |
1430 |
1431 # By convention, ``extra['branch']`` (set by extrafn) clobbers |
1431 # By convention, ``extra['branch']`` (set by extrafn) clobbers |
1432 # ``branch`` (used when passing ``--keepbranches``). |
1432 # ``branch`` (used when passing ``--keepbranches``). |
1433 branch = repo[p1].branch() |
1433 branch = None |
1434 if b'branch' in extra: |
1434 if b'branch' in extra: |
1435 branch = extra[b'branch'] |
1435 branch = extra[b'branch'] |
1436 |
1436 |
1437 memctx = wctx.tomemctx( |
1437 memctx = wctx.tomemctx( |
1438 commitmsg, |
1438 commitmsg, |