Mercurial > hg-stable

changeset 23160:4f4e6815f286

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-revert: sort by output filename again Future patches will change how the output of 'gen-revert-cases.py filelist' is generated, so now we want the order to depend on just the filename again.
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 18 Oct 2014 18:12:54 -0700
parents 20d3e2d73432
children 6f31f46b8544
files tests/test-revert.t
diffstat 1 files changed, 132 insertions(+), 129 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-revert.t	Mon Oct 20 22:54:18 2014 -0700
+++ b/tests/test-revert.t	Sat Oct 18 18:12:54 2014 -0700
@@ -462,8 +462,8 @@
   > 
   > # build the combination of possible states
   > combination = []
-  > for ctxkey, ctxvalue in sorted(ctxcontent.iteritems()):
-  >     for wckey, (tracked, wcfunc) in sorted(wccontent.iteritems()):
+  > for ctxkey, ctxvalue in ctxcontent.iteritems():
+  >     for wckey, (tracked, wcfunc) in wccontent.iteritems():
   >         base, parent = ctxvalue
   >         if (base == parent and 'revert' in wckey):
   >             continue
@@ -481,6 +481,9 @@
   >                                     trackedstring)
   >         combination.append((filename, base, parent, wcc))
   > 
+  > # make sure we have stable output
+  > combination.sort()
+  > 
   > # retrieve the state we must generate
   > target = sys.argv[1]
   > 
@@ -512,36 +515,36 @@
 check list of planned files
 
   $ python gen-revert-cases.py filelist
+  content1_content1_content1-tracked
+  content1_content1_content1-untracked
+  content1_content1_content3-tracked
+  content1_content1_content3-untracked
+  content1_content1_missing-tracked
+  content1_content1_missing-untracked
+  content1_content2_content1-tracked
+  content1_content2_content1-untracked
+  content1_content2_content2-tracked
+  content1_content2_content2-untracked
+  content1_content2_content3-tracked
+  content1_content2_content3-untracked
+  content1_content2_missing-tracked
+  content1_content2_missing-untracked
+  content1_missing_content1-tracked
+  content1_missing_content1-untracked
+  content1_missing_content3-tracked
+  content1_missing_content3-untracked
+  content1_missing_missing-tracked
+  content1_missing_missing-untracked
   missing_content2_content2-tracked
-  missing_content2_missing-tracked
   missing_content2_content2-untracked
-  missing_content2_missing-untracked
-  missing_content2_content3-untracked
   missing_content2_content3-tracked
-  content1_content1_content1-tracked
-  content1_content1_missing-tracked
-  content1_content1_content1-untracked
-  content1_content1_missing-untracked
-  content1_content1_content3-untracked
-  content1_content1_content3-tracked
+  missing_content2_content3-untracked
+  missing_content2_missing-tracked
+  missing_content2_missing-untracked
+  missing_missing_content3-tracked
+  missing_missing_content3-untracked
   missing_missing_missing-tracked
   missing_missing_missing-untracked
-  missing_missing_content3-untracked
-  missing_missing_content3-tracked
-  content1_content2_content2-tracked
-  content1_content2_missing-tracked
-  content1_content2_content1-tracked
-  content1_content2_content2-untracked
-  content1_content2_missing-untracked
-  content1_content2_content1-untracked
-  content1_content2_content3-untracked
-  content1_content2_content3-tracked
-  content1_missing_missing-tracked
-  content1_missing_content1-tracked
-  content1_missing_missing-untracked
-  content1_missing_content1-untracked
-  content1_missing_content3-untracked
-  content1_missing_content3-tracked
 
 Script to make a simple text version of the content
 ---------------------------------------------------
@@ -913,31 +916,69 @@
   >   hg revert $file;
   >   echo
   > done
+  ### revert for: content1_content1_content1-tracked
+  no changes needed to content1_content1_content1-tracked
+  
+  ### revert for: content1_content1_content1-untracked
+  
+  ### revert for: content1_content1_content3-tracked
+  
+  ### revert for: content1_content1_content3-untracked
+  
+  ### revert for: content1_content1_missing-tracked
+  
+  ### revert for: content1_content1_missing-untracked
+  
+  ### revert for: content1_content2_content1-tracked
+  
+  ### revert for: content1_content2_content1-untracked
+  
+  ### revert for: content1_content2_content2-tracked
+  no changes needed to content1_content2_content2-tracked
+  
+  ### revert for: content1_content2_content2-untracked
+  
+  ### revert for: content1_content2_content3-tracked
+  
+  ### revert for: content1_content2_content3-untracked
+  
+  ### revert for: content1_content2_missing-tracked
+  
+  ### revert for: content1_content2_missing-untracked
+  
+  ### revert for: content1_missing_content1-tracked
+  
+  ### revert for: content1_missing_content1-untracked
+  file not managed: content1_missing_content1-untracked
+  
+  ### revert for: content1_missing_content3-tracked
+  
+  ### revert for: content1_missing_content3-untracked
+  file not managed: content1_missing_content3-untracked
+  
+  ### revert for: content1_missing_missing-tracked
+  content1_missing_missing-tracked: no such file in rev * (glob)
+  
+  ### revert for: content1_missing_missing-untracked
+  content1_missing_missing-untracked: no such file in rev * (glob)
+  
   ### revert for: missing_content2_content2-tracked
   no changes needed to missing_content2_content2-tracked
   
-  ### revert for: missing_content2_missing-tracked
-  
   ### revert for: missing_content2_content2-untracked
   
-  ### revert for: missing_content2_missing-untracked
-  
-  ### revert for: missing_content2_content3-untracked
-  
   ### revert for: missing_content2_content3-tracked
   
-  ### revert for: content1_content1_content1-tracked
-  no changes needed to content1_content1_content1-tracked
+  ### revert for: missing_content2_content3-untracked
   
-  ### revert for: content1_content1_missing-tracked
+  ### revert for: missing_content2_missing-tracked
   
-  ### revert for: content1_content1_content1-untracked
-  
-  ### revert for: content1_content1_missing-untracked
+  ### revert for: missing_content2_missing-untracked
   
-  ### revert for: content1_content1_content3-untracked
+  ### revert for: missing_missing_content3-tracked
   
-  ### revert for: content1_content1_content3-tracked
+  ### revert for: missing_missing_content3-untracked
+  file not managed: missing_missing_content3-untracked
   
   ### revert for: missing_missing_missing-tracked
   missing_missing_missing-tracked: no such file in rev * (glob)
@@ -945,44 +986,6 @@
   ### revert for: missing_missing_missing-untracked
   missing_missing_missing-untracked: no such file in rev * (glob)
   
-  ### revert for: missing_missing_content3-untracked
-  file not managed: missing_missing_content3-untracked
-  
-  ### revert for: missing_missing_content3-tracked
-  
-  ### revert for: content1_content2_content2-tracked
-  no changes needed to content1_content2_content2-tracked
-  
-  ### revert for: content1_content2_missing-tracked
-  
-  ### revert for: content1_content2_content1-tracked
-  
-  ### revert for: content1_content2_content2-untracked
-  
-  ### revert for: content1_content2_missing-untracked
-  
-  ### revert for: content1_content2_content1-untracked
-  
-  ### revert for: content1_content2_content3-untracked
-  
-  ### revert for: content1_content2_content3-tracked
-  
-  ### revert for: content1_missing_missing-tracked
-  content1_missing_missing-tracked: no such file in rev * (glob)
-  
-  ### revert for: content1_missing_content1-tracked
-  
-  ### revert for: content1_missing_missing-untracked
-  content1_missing_missing-untracked: no such file in rev * (glob)
-  
-  ### revert for: content1_missing_content1-untracked
-  file not managed: content1_missing_content1-untracked
-  
-  ### revert for: content1_missing_content3-untracked
-  file not managed: content1_missing_content3-untracked
-  
-  ### revert for: content1_missing_content3-tracked
-  
 
 check resulting directory against the --all run
 (There should be no difference)
@@ -1008,33 +1011,68 @@
   >   hg revert $file --rev 'desc(base)';
   >   echo
   > done
-  ### revert for: missing_content2_content2-tracked
+  ### revert for: content1_content1_content1-tracked
+  no changes needed to content1_content1_content1-tracked
+  
+  ### revert for: content1_content1_content1-untracked
+  
+  ### revert for: content1_content1_content3-tracked
+  
+  ### revert for: content1_content1_content3-untracked
+  
+  ### revert for: content1_content1_missing-tracked
+  
+  ### revert for: content1_content1_missing-untracked
+  
+  ### revert for: content1_content2_content1-tracked
+  no changes needed to content1_content2_content1-tracked
+  
+  ### revert for: content1_content2_content1-untracked
+  
+  ### revert for: content1_content2_content2-tracked
+  
+  ### revert for: content1_content2_content2-untracked
   
-  ### revert for: missing_content2_missing-tracked
+  ### revert for: content1_content2_content3-tracked
+  
+  ### revert for: content1_content2_content3-untracked
+  
+  ### revert for: content1_content2_missing-tracked
+  
+  ### revert for: content1_content2_missing-untracked
+  
+  ### revert for: content1_missing_content1-tracked
+  no changes needed to content1_missing_content1-tracked
+  
+  ### revert for: content1_missing_content1-untracked
+  
+  ### revert for: content1_missing_content3-tracked
+  
+  ### revert for: content1_missing_content3-untracked
+  
+  ### revert for: content1_missing_missing-tracked
+  
+  ### revert for: content1_missing_missing-untracked
+  
+  ### revert for: missing_content2_content2-tracked
   
   ### revert for: missing_content2_content2-untracked
   no changes needed to missing_content2_content2-untracked
   
-  ### revert for: missing_content2_missing-untracked
-  no changes needed to missing_content2_missing-untracked
+  ### revert for: missing_content2_content3-tracked
   
   ### revert for: missing_content2_content3-untracked
   no changes needed to missing_content2_content3-untracked
   
-  ### revert for: missing_content2_content3-tracked
+  ### revert for: missing_content2_missing-tracked
   
-  ### revert for: content1_content1_content1-tracked
-  no changes needed to content1_content1_content1-tracked
-  
-  ### revert for: content1_content1_missing-tracked
+  ### revert for: missing_content2_missing-untracked
+  no changes needed to missing_content2_missing-untracked
   
-  ### revert for: content1_content1_content1-untracked
-  
-  ### revert for: content1_content1_missing-untracked
+  ### revert for: missing_missing_content3-tracked
   
-  ### revert for: content1_content1_content3-untracked
-  
-  ### revert for: content1_content1_content3-tracked
+  ### revert for: missing_missing_content3-untracked
+  file not managed: missing_missing_content3-untracked
   
   ### revert for: missing_missing_missing-tracked
   missing_missing_missing-tracked: no such file in rev * (glob)
@@ -1042,41 +1080,6 @@
   ### revert for: missing_missing_missing-untracked
   missing_missing_missing-untracked: no such file in rev * (glob)
   
-  ### revert for: missing_missing_content3-untracked
-  file not managed: missing_missing_content3-untracked
-  
-  ### revert for: missing_missing_content3-tracked
-  
-  ### revert for: content1_content2_content2-tracked
-  
-  ### revert for: content1_content2_missing-tracked
-  
-  ### revert for: content1_content2_content1-tracked
-  no changes needed to content1_content2_content1-tracked
-  
-  ### revert for: content1_content2_content2-untracked
-  
-  ### revert for: content1_content2_missing-untracked
-  
-  ### revert for: content1_content2_content1-untracked
-  
-  ### revert for: content1_content2_content3-untracked
-  
-  ### revert for: content1_content2_content3-tracked
-  
-  ### revert for: content1_missing_missing-tracked
-  
-  ### revert for: content1_missing_content1-tracked
-  no changes needed to content1_missing_content1-tracked
-  
-  ### revert for: content1_missing_missing-untracked
-  
-  ### revert for: content1_missing_content1-untracked
-  
-  ### revert for: content1_missing_content3-untracked
-  
-  ### revert for: content1_missing_content3-tracked
-  
 
 check resulting directory against the --all run
 (There should be no difference)