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 ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4 > # Parent feb77e0951e74d75c213e8471f107fdcc124c876 > remove walk warning about nonexistent files > > diff -r feb77e0951e7 -r ce0a3cc309a8 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

     1

import mercurial.util

     2

     3

def dumbdecode(s, cmd):

     4

    return s.replace('\n', '\r\n')

     5

     6

def dumbencode(s, cmd):

     7

    return s.replace('\r\n', '\n')

     8

     9

def clevertest(s, cmd):

    10

    if '\0' in s: return False

    11

    return True

    12

    13

def cleverdecode(s, cmd):

    14

    if clevertest(s, cmd):

    15

        return dumbdecode(s, cmd)

    16

    return s

    17

    18

def cleverencode(s, cmd):

    19

    if clevertest(s, cmd):

    20

        return dumbencode(s, cmd)

    21

    return s

    22

    23

mercurial.util.filtertable.update({

    24

    'dumbdecode:': dumbdecode,

    25

    'dumbencode:': dumbencode,

    26

    'cleverdecode:': cleverdecode,

    27

    'cleverencode:': cleverencode,

    28

    })