Mercurial > evolve

changeset 486:2111c655b4f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix typo
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 23 Aug 2012 18:00:29 +0200
parents 41bf6c27a122
children 595ae87e94b6
files hgext/obsolete.py tests/test-evolve.t tests/test-obsolete-push.t tests/test-obsolete.t tests/test-qsync.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-tutorial.t tests/test-uncommit.t
diffstat 9 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/obsolete.py	Thu Aug 23 17:40:28 2012 +0200
+++ b/hgext/obsolete.py	Thu Aug 23 18:00:29 2012 +0200
@@ -910,11 +910,11 @@
         newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers
         newconflictings = len(repo.revs('conflicting()')) - priorconflictings
         if newunstables > 0:
-            ui.warn(_('%i new unstables changesets\n') % newunstables)
+            ui.warn(_('%i new unstable changesets\n') % newunstables)
         if newlatecomers > 0:
-            ui.warn(_('%i new latecomers changesets\n') % newlatecomers)
+            ui.warn(_('%i new latecomer changesets\n') % newlatecomers)
         if newconflictings > 0:
-            ui.warn(_('%i new conflictings changesets\n') % newconflictings)
+            ui.warn(_('%i new conflicting changesets\n') % newconflictings)
 
 @eh.reposetup
 def _repostabilizesetup(ui, repo):
--- a/tests/test-evolve.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-evolve.t	Thu Aug 23 18:00:29 2012 +0200
@@ -246,7 +246,7 @@
   [255]
 
   $ hg amend --note 'french looks better'
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg log
   6	feature-A: a nifty feature - test
   4	feature-B: another feature - test
@@ -300,7 +300,7 @@
 phase change turning obsolete changeset public issue a latecomer warning
 
   $ hg phase --public 7
-  1 new latecomers changesets
+  1 new latecomer changesets
 
 all solving latecomer troubled
 
--- a/tests/test-obsolete-push.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-obsolete-push.t	Thu Aug 23 18:00:29 2012 +0200
@@ -28,7 +28,7 @@
   $ hg ci -qAm C c
   $ hg phase --secret --force .
   $ hg kill 0 1
-  1 new unstables changesets
+  1 new unstable changesets
   $ glog --hidden
   @  2:244232c2222a@default(unstable/secret) C
   |
--- a/tests/test-obsolete.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-obsolete.t	Thu Aug 23 18:00:29 2012 +0200
@@ -123,7 +123,7 @@
   $ hg up 3 -q
   Working directory parent is obsolete
   $ mkcommit d # 5 (on 3)
-  1 new unstables changesets
+  1 new unstable changesets
   $ qlog -r 'obsolete()'
   3
   - 0d3f46688ccc
@@ -198,7 +198,7 @@
   Working directory parent is obsolete
   $ mkcommit obsol_d # 6
   created new head
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg debugobsolete `getid 5` `getid 6`
   $ qlog
   6
@@ -254,7 +254,7 @@
   Working directory parent is obsolete
   $ mkcommit "obsol_d'" # 7
   created new head
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg debugobsolete `getid 6` `getid 7`
   $ hg pull -R ../other-new .
   pulling from .
@@ -341,7 +341,7 @@
   Working directory parent is obsolete
   $ mkcommit "obsol_d''"
   created new head
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg debugobsolete `getid 7` `getid 8`
   $ cd ../other-new
   $ hg up -q 3
@@ -537,7 +537,7 @@
 
   $ cd local
   $ hg phase --public 11
-  1 new latecomers changesets
+  1 new latecomer changesets
   $ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n'
   @  12 - (draft) 6db5e282cb91 add obsol_d'''
   |
--- a/tests/test-qsync.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-qsync.t	Thu Aug 23 18:00:29 2012 +0200
@@ -84,7 +84,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "a" >> a
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg graft -O 3
   grafting revision 3
   $ hg qsync -a
--- a/tests/test-stabilize-order.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-stabilize-order.t	Thu Aug 23 18:00:29 2012 +0200
@@ -40,13 +40,13 @@
   [2] addb
   $ echo b >> b
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg gdown
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [1] adda
   $ echo a >> a
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ glog
   @  7:f5ff10856e5a@default(draft) adda
   |
@@ -127,7 +127,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ glog
   @  11:4e7cec6b4afe@default(draft) addb
   |
--- a/tests/test-stabilize-result.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 23 18:00:29 2012 +0200
@@ -28,7 +28,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo a >> a
   $ hg amend -m changea
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg stabilize -v
   move:[2] changea
   atop:[4] changea
@@ -69,7 +69,7 @@
   [4] changea
   $ echo 'a' > a
   $ hg amend
-  1 new unstables changesets
+  1 new unstable changesets
   $ hg stabilize
   move:[5] newer a
   atop:[7] changea
@@ -132,7 +132,7 @@
 Make precursors public
 
   $ hg phase --public 8
-  1 new latecomers changesets
+  1 new latecomer changesets
   $ glog
   @  12:15c83af6f3a3@default(draft) bk:[] newer a
   |
@@ -211,7 +211,7 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new conflictings changesets
+  2 new conflicting changesets
   $ glog
   @  19:3883461cc228@default(draft) bk:[] More addition
   |
--- a/tests/test-tutorial.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-tutorial.t	Thu Aug 23 18:00:29 2012 +0200
@@ -574,7 +574,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   (run 'hg heads .' to see heads, 'hg merge' to merge)
-  1 new unstables changesets
+  1 new unstable changesets
 
 
 The new changeset "animal" is based one an old changeset of "bathroom". You can
@@ -714,7 +714,7 @@
   $ hg prune 437efbcaf700
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at ffa278c50818
-  1 new unstables changesets
+  1 new unstable changesets
 
 
 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
--- a/tests/test-uncommit.t	Thu Aug 23 17:40:28 2012 +0200
+++ b/tests/test-uncommit.t	Thu Aug 23 18:00:29 2012 +0200
@@ -242,7 +242,7 @@
   Working directory parent is obsolete
   $ hg --config extensions.purge= purge
   $ hg uncommit -I 'set:added() and e'
-  2 new conflictings changesets
+  2 new conflicting changesets
   $ hg st --copies
   A e
   $ hg st --copies --change .
@@ -286,7 +286,7 @@
   Working directory parent is obsolete
   $ hg --config extensions.purge= purge
   $ hg uncommit --all -X e
-  1 new conflictings changesets
+  1 new conflicting changesets
   $ hg st --copies
   M b
   M d
@@ -333,4 +333,4 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [8] touncommit
   $ hg uncommit aa
-  1 new unstables changesets
+  1 new unstable changesets