comparison hgext/convert/monotone.py @ 8124:d883bfbd2e60

convert/mtn: handle directory move into moved directory (issue1619/3)

8123:933b874e402f

            for tofile in self.files:
                if tofile in ignoremove:
                    continue
                if tofile.startswith(todir + '/'):
                    renamed[tofile] = fromdir + tofile[len(todir):]
            for tofile, fromfile in renamed.items():
                self.ui.debug (_("copying file in renamed dir from '%s' to '%s'") 
                               % (fromfile, tofile), '\n')
                files[tofile] = rev
                copies[tofile] = fromfile

8124:d883bfbd2e60

            for tofile in self.files:
                if tofile in ignoremove:
                    continue
                if tofile.startswith(todir + '/'):
                    renamed[tofile] = fromdir + tofile[len(todir):]
                    # Avoid chained moves like:
                    # d1(/a) => d3/d1(/a)
                    # d2 => d3
                    ignoremove[tofile] = 1
            for tofile, fromfile in renamed.items():
                self.ui.debug (_("copying file in renamed dir from '%s' to '%s'") 
                               % (fromfile, tofile), '\n')
                files[tofile] = rev
                copies[tofile] = fromfile