Skip to content
Snippets Groups Projects
  • Gilles Moris's avatar
    60849263
    summary: move the parents phase marker to commit line (issue4688) · 60849263
    Gilles Moris authored
    The phase of the pending commit depends on the parent of the working directory
    and on the phases.newcommit configuration.
    First, this information rather depend on the commit line which describe the
    pending commit.
    Then, we only want to be advertised when the pending phase is going to be higher
    than the default new commit phase.
    
    So the format will change from
    
    $ hg summary
    parent: 2:ab91dfabc5ad
     foo
    parent: 3:24f1031ad244 tip
     bar
    branch: default
    commit: 1 modified, 1 unknown, 1 unresolved (merge)
    update: (current)
    phases: 1 secret (secret)
    
    to
    
    parent: 2:ab91dfabc5ad
     foo
    parent: 3:24f1031ad244 tip
     bar
    branch: default
    commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret)
    update: (current)
    phases: 1 secret
    60849263
    History
    summary: move the parents phase marker to commit line (issue4688)
    Gilles Moris authored
    The phase of the pending commit depends on the parent of the working directory
    and on the phases.newcommit configuration.
    First, this information rather depend on the commit line which describe the
    pending commit.
    Then, we only want to be advertised when the pending phase is going to be higher
    than the default new commit phase.
    
    So the format will change from
    
    $ hg summary
    parent: 2:ab91dfabc5ad
     foo
    parent: 3:24f1031ad244 tip
     bar
    branch: default
    commit: 1 modified, 1 unknown, 1 unresolved (merge)
    update: (current)
    phases: 1 secret (secret)
    
    to
    
    parent: 2:ab91dfabc5ad
     foo
    parent: 3:24f1031ad244 tip
     bar
    branch: default
    commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret)
    update: (current)
    phases: 1 secret
test-subrepo.t 43.56 KiB