comparison hgext/rebase.py @ 44050:2ecbc4ec87d8

overlayworkingctx: default branch to base context's branch

This matches what the dirstate does (it reuses working copy parent's
branch unless told otherwise). By moving the default out of
`rebase.commitmemorynode()`, it will let us clean that up better
later.

Differential Revision: https://phab.mercurial-scm.org/D7821

44049:6cfaebb625d3

    if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
        return None

    # By convention, ``extra['branch']`` (set by extrafn) clobbers
    # ``branch`` (used when passing ``--keepbranches``).
    branch = repo[p1].branch()
    if b'branch' in extra:
        branch = extra[b'branch']

    memctx = wctx.tomemctx(
        commitmsg,

44050:2ecbc4ec87d8

    if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'):
        return None

    # By convention, ``extra['branch']`` (set by extrafn) clobbers
    # ``branch`` (used when passing ``--keepbranches``).
    branch = None
    if b'branch' in extra:
        branch = extra[b'branch']

    memctx = wctx.tomemctx(
        commitmsg,