comparison tests/test-keyword.t @ 18234:a55b06885cda

branchmap: allow to use cache of subset Filtered repository are *subset* of unfiltered repository. This means that a filtered branchmap could be use to compute the unfiltered version. And filtered version happen to be subset of each other: - "all() - unserved()" is a subset of "all() - hidden()" - "all() - hidden()" is a subset of "all()" This means that branchmap with "unfiltered" filter can be used as a base for "hidden" branchmap that itself could be used as a base for unfiltered branchmap. unserved < hidden < None This changeset implements this mechanism. If the on disk branchcache is not valid we use the branchcache of the nearest subset as base instead of computing it from scratch. Such fallback can be cascaded multiple time is necessary. Note that both "hidden" and "unserved" set are a bit volatile. We will add more stable filtering in next changesets. This changeset enables collaboration between no filtering and "unserved" filtering. Fixing performance regression introduced by 47f00b0de337
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 07 Jan 2013 17:23:25 +0100
parents 082d6929fd4d
children aff706b3a21c
comparison
equal deleted inserted replaced
18233:59a9f18d4587 18234:a55b06885cda
745 ? log 745 ? log
746 746
747 Commit with multi-line message and custom expansion 747 Commit with multi-line message and custom expansion
748 748
749 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' 749 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
750 invalid branchheads cache: tip differs
750 a 751 a
752 invalid branchheads cache: tip differs
751 overwriting a expanding keywords 753 overwriting a expanding keywords
752 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 754 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
753 $ rm log 755 $ rm log
754 756
755 Stat, verify and show custom expansion (firstline) 757 Stat, verify and show custom expansion (firstline)
787 remove with status checks 789 remove with status checks
788 790
789 $ hg debugrebuildstate 791 $ hg debugrebuildstate
790 $ hg remove a 792 $ hg remove a
791 $ hg --debug commit -m rma 793 $ hg --debug commit -m rma
794 invalid branchheads cache: tip differs
795 invalid branchheads cache: tip differs
792 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 796 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
793 $ hg status 797 $ hg status
794 ? c 798 ? c
795 799
796 Rollback, revert, and check expansion 800 Rollback, revert, and check expansion
897 $ hg --verbose kwexpand x/a 901 $ hg --verbose kwexpand x/a
898 abort: outstanding uncommitted changes 902 abort: outstanding uncommitted changes
899 [255] 903 [255]
900 $ cd x 904 $ cd x
901 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' 905 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
906 invalid branchheads cache: tip differs
902 x/a 907 x/a
903 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e 908 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
909 invalid branchheads cache: tip differs
904 overwriting x/a expanding keywords 910 overwriting x/a expanding keywords
905 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 911 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
906 $ cat a 912 $ cat a
907 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ 913 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $
908 do not process $Id: 914 do not process $Id: