Patchwork [1,of,4] documentation: update to new filter names

login
register
mail settings
Submitter Pierre-Yves David
Date Jan. 21, 2013, 6:48 p.m.
Message ID <f4d2c2dafbb336a89a03.1358794107@crater2.logilab.fr>
Download mbox | patch
Permalink /patch/698/
State Accepted
Commit 593eb378616582965c1b85ceaf4a834ff3d906a4
Headers show

Comments

Pierre-Yves David - Jan. 21, 2013, 6:48 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1358793615 -3600
# Branch stable
# Node ID f4d2c2dafbb336a89a036b669c03112dd6306331
# Parent  8a811fa9a9c0785b843e032ed82ce5316a645631
documentation: update to new filter names

Changeset f3b21beb9802 change filter names but forgot some documentation
updates.
Matt Mackall - Jan. 21, 2013, 7:16 p.m.
On Mon, 2013-01-21 at 19:48 +0100, pierre-yves.david@logilab.fr wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@logilab.fr>
> # Date 1358793615 -3600
> # Branch stable
> # Node ID f4d2c2dafbb336a89a036b669c03112dd6306331
> # Parent  8a811fa9a9c0785b843e032ed82ce5316a645631
> documentation: update to new filter names

Queued for stable, thanks.

Patch

diff --git a/mercurial/repoview.py b/mercurial/repoview.py
--- a/mercurial/repoview.py
+++ b/mercurial/repoview.py
@@ -70,11 +70,11 @@  def computemutable(repo):
     return frozenset()
 
 def computeimpactable(repo):
     """Everything impactable by mutable revision
 
-    The mutable filter still have some chance to get invalidated. This will
+    The immutable filter still have some chance to get invalidated. This will
     happen when:
 
     - you garbage collect hidden changeset,
     - public phase is moved backward,
     - something is changed in the filtering (this could be fixed)
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -749,18 +749,18 @@  Interrupted commit should not change sta
 
 Commit with multi-line message and custom expansion
 
 |Note:
 |
-| After the last rollback, the "unserved" branchheads cache became invalid, but
+| After the last rollback, the "served" branchheads cache became invalid, but
 | all changesets in the repo were public. For filtering this means:
-|   "mutable" == "unserved" == ø.
+|   "immutable" == "served" == ø.
 |
-| As the "unserved" cache is invalid, we fall back to the "mutable" cache. But
-| no update is needed between "mutable" and "unserved" and the "unserved" cache
+| As the "served" cache is invalid, we fall back to the "immutable" cache. But
+| no update is needed between "immutable" and "served" and the "served" cache
 | is not updated on disk. The on-disk version therefore stays invalid for some
-| time. This explains why the "unserved" branchheads cache is detected as
+| time. This explains why the "served" branchheads cache is detected as
 | invalid here.
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
   invalid branchheads cache (served): tip differs
   a
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -171,11 +171,11 @@  visible shared between the initial repo 
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
 
 :note: The "(+1 heads)" is wrong as we do not had any visible head
 
-check that branch cache with "unserved" filter are properly computed and stored
+check that branch cache with "served" filter are properly computed and stored
 
   $ ls ../push-dest/.hg/cache/branchheads*
   ../push-dest/.hg/cache/branchheads-served
   $ cat ../push-dest/.hg/cache/branchheads-served
   6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722