Patchwork [4,of,5] test-histedit: reorder phases test and prepare for more

login
register
mail settings
Submitter Pierre-Yves David
Date Jan. 16, 2013, 6:28 p.m.
Message ID <f4fa682477205f666708.1358360898@crater2.logilab.fr>
Download mbox | patch
Permalink /patch/657/
State Accepted
Commit c6e3fa134da595c81d65bb08e82a924cc8cd4bc4
Headers show

Comments

Pierre-Yves David - Jan. 16, 2013, 6:28 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1358360396 -3600
# Node ID f4fa682477205f666708bdc46a4bf75753213322
# Parent  5be4bc70c20574a1ea3af9ce99b7921922ace0ef
test-histedit: reorder phases test and prepare for more

We are going to add a lot regarding phase of test while fixing issue3724.

This movement allows to put them after this first phase test.

Patch

diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -123,35 +123,16 @@  check hidden revision are ignored (6 hav
   > EOF
   $ hg histedit 6 --commands commands.txt
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 
-Check that histedit respect phases
-=========================================
-
-(not directly related to the test file but doesn't deserve it's own test case)
-
-  $ hg log -G
-  @  9:c13eb81022ca f
-  |
-  o  6:b346ab9a313d c
-  |
-  o  0:cb9a9f314b8b a
-  
-  $ hg ph -pv '.^'
-  phase changed for 2 changesets
-  $ hg histedit -r '.~2'
-  abort: cannot edit immutable changeset: cb9a9f314b8b
-  [255]
-
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg ph -fd '.'
   $ hg log -r 'children(.)'
   9:c13eb81022ca f (no-eol)
   $ cat > commands.txt <<EOF
   > edit b346ab9a313d 6 c
   > EOF
@@ -169,5 +150,30 @@  Test that rewriting leaving instability 
   9:c13eb81022ca f (no-eol)
 
 stabilise
 
   $ hg rebase  -r 'unstable()' -d .
+
+Check that histedit respect phases
+=========================================
+
+(not directly related to the test file but doesn't deserve it's own test case)
+
+  $ cat >> $HGRCPATH << EOF
+  > [ui]
+  > logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n
+  > EOF
+
+  $ hg ph -pv '.^'
+  phase changed for 2 changesets
+  $ hg log -G
+  @  11:b449568bf7fc (draft) f
+  |
+  o  10:40db8afa467b (public) c
+  |
+  o  0:cb9a9f314b8b (public) a
+  
+  $ hg histedit -r '.~2'
+  abort: cannot edit immutable changeset: cb9a9f314b8b
+  [255]
+
+