Mercurial > evolve
diff tests/test-topic-dest.t @ 1885:d49f75eab6a3
topic: take topic in account for all branch head computation
This changeset introduce a "topicmap" that is tracking not just the head of all
branches, but the heads of all branch+topic pair. Including the head of the part
of the branch without any topic. In practice this means that BRANCHNAME now
resolve to the tipmost part for the branch without topic and impact various
other logic like head checking during push and default destination for update and
merge (these aspect will need adjustment in later changesets).
The on-the-fly-temporary-monkey-patching process is pretty horrible, but allow
to move forward without waiting on having core patched.
We use 'branch:topic' as the branchmap key, this is a small and easy hack that
help use a lot for (future) support of heads discovery/checking and on disc
cache. I'm not sure it is worthwhile to improve this until an implementation
into core.
Note that this changeset change the branchmap in all cases, including during
exchange, see next changeset for improved behavior.
We also currently have the on-disk cache disabled because the core branchmap is
lacking phase information in its cache key. This will get done in a later
changesets
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Sat, 12 Mar 2016 15:36:17 +0000 |
parents | 9eba8561870b |
children | 077c40f206d1 |
line wrap: on
line diff
--- a/tests/test-topic-dest.t Mon Mar 14 20:18:09 2016 -0400 +++ b/tests/test-topic-dest.t Sat Mar 12 15:36:17 2016 +0000 @@ -39,6 +39,8 @@ $ hg log -r 'ngtip(.)' 3 () c_delta + $ hg log -r 'default' + 3 () c_delta multiple heads with topic @@ -64,6 +66,8 @@ $ hg log -r 'ngtip(.)' 3 () c_delta + $ hg log -r 'default' + 3 () c_delta one of the head is a valid tip @@ -72,7 +76,6 @@ $ echo epsilon >> epsilon $ hg add epsilon $ hg ci -m "c_epsilon" - created new head $ hg log -G @ 6 () c_epsilon | @@ -90,12 +93,16 @@ $ hg log -r 'ngtip(.)' 6 () c_epsilon + $ hg log -r 'default' + 6 () c_epsilon merge destination ================= $ hg up 'ngtip(default)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg up default + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo zeta >> zeta $ hg add zeta $ hg ci -m "c_zeta"