upstream/mercurial-mirror Files · tests/test-revert

Re: [PATCH 2 of 3] remove walk warning about nonexistent files...

Re: [PATCH 2 of 3] remove walk warning about nonexistent files On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote: > # HG changeset patch > # User Robin Farine <robin.farine@terminus.org> > # Node ID > # Parent > remove walk warning about nonexistent files > > diff -r -r mercurial/dirstate.py > --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100 > +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100 > @@ -336,9 +336,6 @@ > try: > st = os.lstat(f) > except OSError, inst: > - if ff not in dc: self.ui.warn('%s: %s\n' % ( > - util.pathto(self.getcwd(), ff), > - inst.strerror)) > continue > if stat.S_ISDIR(st.st_mode): > cmp1 = (lambda x, y: cmp(x[1], y[1])) this break some tests, a better fix would be to check if ff can be a directory prefix from files in dc you can try the attached patch. Benoit

Benoit Boissinot - - Load All Authors

File last commit:

r1487:2bc6cd62 default


                r1564:34579a67

default

Download file

             test-revert
        
                    32 lines
            
             | 567 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-revert

History | Source | Raw |Copy content |Copy permalink

Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	#!/bin/sh

		hg init
		echo 123 > a
		echo 123 > c
		hg add a c
		hg commit -m "first" -d "0 0" a c
		echo 123 > b
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show b unknown
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
		echo 12 > c
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show b unknown and c modified
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
		hg add b
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show b added and c modified
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
		hg rm a
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show a removed, b added and c modified
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
		hg revert a
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show b added and c modified
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
		hg revert b
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show b unknown and c modified
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
		hg revert c
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show b unknown
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	hg status
Benoit Boissinot fix handling of files of unsupported type in the walk code...	r1487	echo %% should show a b and c
Benoit Boissinot revert added and removed files to their normal state before reverting...	r1447	ls

		true

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages