Mercurial > hg-stable

changeset 1309:332f225b835c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make debugwalk strip trailing spaces and remove these from test-walk.out
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 21 Sep 2005 08:07:38 +0200
parents 2073e5a71008
children 7e8a55c9ee5c
files mercurial/commands.py tests/test-walk.out
diffstat 2 files changed, 69 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Sep 21 07:56:19 2005 +0200
+++ b/mercurial/commands.py	Wed Sep 21 08:07:38 2005 +0200
@@ -902,11 +902,12 @@
     items = list(walk(repo, pats, opts))
     if not items:
         return
-    fmt = '%%s  %%-%ds  %%-%ds  %%s\n' % (
+    fmt = '%%s  %%-%ds  %%-%ds  %%s' % (
         max([len(abs) for (src, abs, rel, exact) in items]),
         max([len(rel) for (src, abs, rel, exact) in items]))
     for src, abs, rel, exact in items:
-        ui.write(fmt % (src, abs, rel, exact and 'exact' or ''))
+        line = fmt % (src, abs, rel, exact and 'exact' or '')
+        ui.write("%s\n" % line.rstrip())
 
 def diff(ui, repo, *pats, **opts):
     """diff working directory (or selected files)"""
--- a/tests/test-walk.out	Wed Sep 21 07:56:19 2005 +0200
+++ b/tests/test-walk.out	Wed Sep 21 08:07:38 2005 +0200
@@ -12,74 +12,74 @@
 adding mammals/Procyonidae/coatimundi
 adding mammals/Procyonidae/raccoon
 adding mammals/skunk
-f  beans/black                     beans/black                     
-f  beans/borlotti                  beans/borlotti                  
-f  beans/kidney                    beans/kidney                    
-f  beans/navy                      beans/navy                      
-f  beans/pinto                     beans/pinto                     
-f  beans/turtle                    beans/turtle                    
-f  fennel                          fennel                          
-f  fenugreek                       fenugreek                       
-f  fiddlehead                      fiddlehead                      
-f  glob:glob                       glob:glob                       
-f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle  
-f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi  
-f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon     
-f  mammals/skunk                   mammals/skunk                   
-f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle  
-f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi  
-f  mammals/Procyonidae/raccoon     Procyonidae/raccoon     
-f  mammals/skunk                   skunk                   
-f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle  
-f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi  
-f  mammals/Procyonidae/raccoon     Procyonidae/raccoon     
-f  mammals/Procyonidae/cacomistle  cacomistle  
-f  mammals/Procyonidae/coatimundi  coatimundi  
-f  mammals/Procyonidae/raccoon     raccoon     
-f  mammals/Procyonidae/cacomistle  cacomistle  
-f  mammals/Procyonidae/coatimundi  coatimundi  
-f  mammals/Procyonidae/raccoon     raccoon     
-f  mammals/skunk                   ../skunk    
-f  beans/black     ../beans/black     
-f  beans/borlotti  ../beans/borlotti  
-f  beans/kidney    ../beans/kidney    
-f  beans/navy      ../beans/navy      
-f  beans/pinto     ../beans/pinto     
-f  beans/turtle    ../beans/turtle    
-f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle  
-f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi  
-f  mammals/Procyonidae/raccoon     Procyonidae/raccoon     
-f  mammals/skunk                   skunk                   
-f  beans/black     beans/black     
-f  beans/borlotti  beans/borlotti  
-f  beans/kidney    beans/kidney    
-f  beans/navy      beans/navy      
-f  beans/pinto     beans/pinto     
-f  beans/turtle    beans/turtle    
-f  beans/black     beans/black     
-f  beans/borlotti  beans/borlotti  
-f  mammals/skunk  mammals/skunk  
-f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle  
-f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi  
-f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon     
-f  mammals/skunk                   mammals/skunk                   
+f  beans/black                     beans/black
+f  beans/borlotti                  beans/borlotti
+f  beans/kidney                    beans/kidney
+f  beans/navy                      beans/navy
+f  beans/pinto                     beans/pinto
+f  beans/turtle                    beans/turtle
+f  fennel                          fennel
+f  fenugreek                       fenugreek
+f  fiddlehead                      fiddlehead
+f  glob:glob                       glob:glob
+f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
+f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
+f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
+f  mammals/skunk                   mammals/skunk
+f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
+f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
+f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
+f  mammals/skunk                   skunk
+f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
+f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
+f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
+f  mammals/Procyonidae/cacomistle  cacomistle
+f  mammals/Procyonidae/coatimundi  coatimundi
+f  mammals/Procyonidae/raccoon     raccoon
+f  mammals/Procyonidae/cacomistle  cacomistle
+f  mammals/Procyonidae/coatimundi  coatimundi
+f  mammals/Procyonidae/raccoon     raccoon
+f  mammals/skunk                   ../skunk
+f  beans/black     ../beans/black
+f  beans/borlotti  ../beans/borlotti
+f  beans/kidney    ../beans/kidney
+f  beans/navy      ../beans/navy
+f  beans/pinto     ../beans/pinto
+f  beans/turtle    ../beans/turtle
+f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
+f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
+f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
+f  mammals/skunk                   skunk
+f  beans/black     beans/black
+f  beans/borlotti  beans/borlotti
+f  beans/kidney    beans/kidney
+f  beans/navy      beans/navy
+f  beans/pinto     beans/pinto
+f  beans/turtle    beans/turtle
+f  beans/black     beans/black
+f  beans/borlotti  beans/borlotti
+f  mammals/skunk  mammals/skunk
+f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
+f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
+f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
+f  mammals/skunk                   mammals/skunk
 abort: .. not under root
 abort: beans/../.. not under root
-f  fennel      fennel      
-f  fenugreek   fenugreek   
-f  fiddlehead  fiddlehead  
-f  glob:glob   glob:glob   
-f  beans/black    beans/black    
-f  fenugreek      fenugreek      
-f  glob:glob      glob:glob      
-f  mammals/skunk  mammals/skunk  
-f  beans/black  beans/black  
-f  beans/black     beans/black     
-f  beans/borlotti  beans/borlotti  
-f  beans/kidney    beans/kidney    
-f  beans/navy      beans/navy      
-f  beans/pinto     beans/pinto     
-f  beans/turtle    beans/turtle    
+f  fennel      fennel
+f  fenugreek   fenugreek
+f  fiddlehead  fiddlehead
+f  glob:glob   glob:glob
+f  beans/black    beans/black
+f  fenugreek      fenugreek
+f  glob:glob      glob:glob
+f  mammals/skunk  mammals/skunk
+f  beans/black  beans/black
+f  beans/black     beans/black
+f  beans/borlotti  beans/borlotti
+f  beans/kidney    beans/kidney
+f  beans/navy      beans/navy
+f  beans/pinto     beans/pinto
+f  beans/turtle    beans/turtle
 NOEXIST: No such file or directory
 fifo: unsupported file type (type is fifo)
 m  fenugreek  fenugreek  exact