Mercurial > hg
view tests/test-issue5979.t @ 45346:3c783ff08d40
mergeresult: introduce filemap() which yields filename based mapping
We wanted to remove `actions` as this was leaking how we store things internally
and was direct access to one of the member. This introduces filemap() which
yields a map of `filename` -> `action, args, msg`.
`mergeresult.actions` has been deleted as it's no longer required.
Differential Revision: https://phab.mercurial-scm.org/D8888
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 05 Aug 2020 16:00:25 +0530 |
parents | ef6cab7930b3 |
children |
line wrap: on
line source
$ hg init r1 $ cd r1 $ hg ci --config ui.allowemptycommit=true -m c0 $ hg ci --config ui.allowemptycommit=true -m c1 $ hg ci --config ui.allowemptycommit=true -m c2 $ hg co -q 0 $ hg ci --config ui.allowemptycommit=true -m c3 created new head $ hg co -q 3 $ hg merge --quiet $ hg ci --config ui.allowemptycommit=true -m c4 $ hg log -G -T'{desc}' @ c4 |\ | o c3 | | o | c2 | | o | c1 |/ o c0 >>> from mercurial import hg >>> from mercurial import ui as uimod >>> repo = hg.repository(uimod.ui()) >>> for anc in repo.changelog.ancestors([4], inclusive=True): ... print(anc) 4 3 2 1 0