Mercurial > public > mercurial-scm > hg

diff tests/test-largefiles-misc.t @ 25382:6084926366b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: move the parents phase marker to commit line (issue4688) The phase of the pending commit depends on the parent of the working directory and on the phases.newcommit configuration. First, this information rather depend on the commit line which describe the pending commit. Then, we only want to be advertised when the pending phase is going to be higher than the default new commit phase. So the format will change from $ hg summary parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) update: (current) phases: 1 secret (secret) to parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret) update: (current) phases: 1 secret
author Gilles Moris <gilles.moris@free.fr>
date Fri, 29 May 2015 22:23:58 +0200
parents bd625cd4e5e7
children 4d2b9b304ad0
line wrap: on
line diff
--- a/tests/test-largefiles-misc.t	Mon May 25 16:48:55 2015 -0700
+++ b/tests/test-largefiles-misc.t	Fri May 29 22:23:58 2015 +0200
@@ -228,7 +228,7 @@
   branch: default
   commit: 1 subrepos
   update: (current)
-  phases: 2 draft (draft)
+  phases: 2 draft
   $ hg st
   $ hg st -S
   A subrepo/large.txt
@@ -246,7 +246,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 3 draft (draft)
+  phases: 3 draft
   $ echo "rev 2" > subrepo/large.txt
   $ hg st -S
   M subrepo/large.txt
@@ -256,7 +256,7 @@
   branch: default
   commit: 1 subrepos
   update: (current)
-  phases: 3 draft (draft)
+  phases: 3 draft
   $ hg ci -m "this commit should fail without -S"
   abort: uncommitted changes in subrepository 'subrepo'
   (use --subrepos for recursive commit)
@@ -570,7 +570,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 1 draft (draft)
+  phases: 1 draft
   largefiles: (no remote repo)
 
 check messages when there is no files to upload:
@@ -585,7 +585,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 1 draft (draft)
+  phases: 1 draft
   largefiles: (no files to upload)
   $ hg -R clone2 outgoing --large
   comparing with $TESTTMP/issue3651/src (glob)
@@ -613,7 +613,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 2 draft (draft)
+  phases: 2 draft
   largefiles: 1 entities for 1 files to upload
   $ hg -R clone2 outgoing --large
   comparing with $TESTTMP/issue3651/src (glob)
@@ -649,7 +649,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 3 draft (draft)
+  phases: 3 draft
   largefiles: 1 entities for 3 files to upload
   $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
   comparing with $TESTTMP/issue3651/src (glob)
@@ -699,7 +699,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 6 draft (draft)
+  phases: 6 draft
   largefiles: 3 entities for 3 files to upload
   $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
   comparing with $TESTTMP/issue3651/src (glob)
@@ -758,7 +758,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 6 draft (draft)
+  phases: 6 draft
   largefiles: 2 entities for 1 files to upload
   $ hg -R clone2 outgoing --large -T "{rev}:{node|short}\n"
   comparing with $TESTTMP/issue3651/src (glob)