upstream/mercurial-mirror Files · tests/svn/svndump-replace.sh

context: override workingctx.hex() to avoid a crash...

context: override workingctx.hex() to avoid a crash Since node is None for workingctx, it can't use the base class implementation of 'hex(self.node())'. It doesn't appear that there are any current callers of this, but there will be when archive supports 'wdir()'. My first thought was to use "{p1node}+", but that would cause headaches elsewhere [1]. We should probably fix up localrepository.__getitem__ to accept this hash for consistency, as a followup. This works, if the full hash is specified: @@ -480,7 +480,7 @@ return dirstate.dirstate(self.vfs, self.ui, self.root, validate) def __getitem__(self, changeid): - if changeid is None: + if changeid is None or changeid == 'ff' * 20: return context.workingctx(self) if isinstance(changeid, slice): return [context.changectx(self, i) That differs from null, where it will accept any number of 0s, as long as it isn't ambiguous. [1] https://www.selenic.com/pipermail/mercurial-devel/2015-June/071166.html

Patrick Mezard - - Load All Authors

File last commit:

r13052:5fb924ee stable


                r25590:183965a0

default

Download file

             svndump-replace.sh
        
                    81 lines
            
             | 1.5 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / svn / svndump-replace.sh
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
convert/svn: handle files/links replaced by dirs (issue2166)

              r11128
            
      #!/bin/sh

      RSVN="`pwd`/rsvn.py"

      export PATH=/bin:/usr/bin

      mkdir temp

      cd temp

      svnadmin create repo

      svn co file://`pwd`/repo wc

      cd wc

      mkdir trunk branches

      cd trunk

      echo a > a

      mkdir d

      echo b > d/b

      ln -s d dlink

      ln -s d dlink2

      ln -s d dlink3

        Patrick Mezard
    
convert/svn: fix changed files list upon directory replacements...

              r13052
            
      mkdir d2

      echo a > d2/a

        Patrick Mezard
    
convert/svn: handle files/links replaced by dirs (issue2166)

              r11128
            
      cd ..

      svn add *

      svn ci -m 'initial'

      # Clobber symlink with file with similar content

      cd trunk

      ls -Alh

      readlink dlink3 > dlink3tmp

      rm dlink3

      mv dlink3tmp dlink3

      svn propdel svn:special dlink3

      svn ci -m 'clobber symlink'

      cd ..

      svn up

      # Clobber files and symlink with directories

      cd ..

      cat > clobber.rsvn <<EOF

      rdelete trunk/a

      rdelete trunk/dlink

      rcopy trunk/d trunk/a

      rcopy trunk/d trunk/dlink

      EOF

      python $RSVN --message=clobber1 --username=evil `pwd`/repo < clobber.rsvn

      # Clobber non-symlink with symlink with same content (kudos openwrt)

      cat > clobber.rsvn <<EOF

      rdelete trunk/dlink3

      rcopy trunk/dlink2 trunk/dlink3

      EOF

      python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn

        Patrick Mezard
    
convert/svn: fix changed files list upon directory replacements...

              r13052
            
      # Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2,

      # 'b' is in trunk/d2 and 'c' is in branch/d2

      cd wc/trunk

      echo b > d2/b

      svn add d2/b

      svn ci -m adddb

      cd ..

      svn up

      svn cp trunk branches/branch

      cd branches/branch

      svn rm d2/b

      echo c > d2/c

      svn add d2/c

      cd ../..

      svn ci -m branch

      svn up

      cd ..

      cat > clobber.rsvn <<EOF

      rdelete trunk/d2

      rcopy branches/branch/d2 trunk/d2

      EOF

      python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn

        Patrick Mezard
    
convert/svn: handle files/links replaced by dirs (issue2166)

              r11128
            
      svn log -v file://`pwd`/repo

      svnadmin dump repo > ../replace.svndump

	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

Patrick Mezard convert/svn: handle files/links replaced by dirs (issue2166)	r11128	#!/bin/sh

		RSVN="`pwd`/rsvn.py"
		export PATH=/bin:/usr/bin
		mkdir temp
		cd temp

		svnadmin create repo
		svn co file://`pwd`/repo wc

		cd wc
		mkdir trunk branches
		cd trunk
		echo a > a
		mkdir d
		echo b > d/b
		ln -s d dlink
		ln -s d dlink2
		ln -s d dlink3
Patrick Mezard convert/svn: fix changed files list upon directory replacements...	r13052	mkdir d2
		echo a > d2/a
Patrick Mezard convert/svn: handle files/links replaced by dirs (issue2166)	r11128	cd ..
		svn add *
		svn ci -m 'initial'
		# Clobber symlink with file with similar content
		cd trunk
		ls -Alh
		readlink dlink3 > dlink3tmp
		rm dlink3
		mv dlink3tmp dlink3
		svn propdel svn:special dlink3
		svn ci -m 'clobber symlink'
		cd ..
		svn up

		# Clobber files and symlink with directories
		cd ..
		cat > clobber.rsvn <<EOF
		rdelete trunk/a
		rdelete trunk/dlink
		rcopy trunk/d trunk/a
		rcopy trunk/d trunk/dlink
		EOF

		python $RSVN --message=clobber1 --username=evil `pwd`/repo < clobber.rsvn

		# Clobber non-symlink with symlink with same content (kudos openwrt)
		cat > clobber.rsvn <<EOF
		rdelete trunk/dlink3
		rcopy trunk/dlink2 trunk/dlink3
		EOF

		python $RSVN --message=clobber2 --username=evil `pwd`/repo < clobber.rsvn

Patrick Mezard convert/svn: fix changed files list upon directory replacements...	r13052	# Create d2 in branch so d2 has 'a' is in branch/d2 and trunk/d2,
		# 'b' is in trunk/d2 and 'c' is in branch/d2
		cd wc/trunk
		echo b > d2/b
		svn add d2/b
		svn ci -m adddb
		cd ..
		svn up
		svn cp trunk branches/branch
		cd branches/branch
		svn rm d2/b
		echo c > d2/c
		svn add d2/c
		cd ../..
		svn ci -m branch
		svn up
		cd ..

		cat > clobber.rsvn <<EOF
		rdelete trunk/d2
		rcopy branches/branch/d2 trunk/d2
		EOF
		python $RSVN --message=clobberdir --username=evil `pwd`/repo < clobber.rsvn

Patrick Mezard convert/svn: handle files/links replaced by dirs (issue2166)	r11128	svn log -v file://`pwd`/repo

		svnadmin dump repo > ../replace.svndump