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

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Patrick Mezard - - Load All Authors

File last commit:

r11194:67985364 stable


                r33051:15a79ac8

default

Download file

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

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      #!/bin/sh

      #

      # Use this script to generate branches.svndump

      #

      mkdir temp

      cd temp

      mkdir project-orig

      cd project-orig

      mkdir trunk

      mkdir branches

      cd ..

      svnadmin create svn-repo

      svnurl=file://`pwd`/svn-repo

      svn import project-orig $svnurl -m "init projA"

      svn co $svnurl project

      cd project

      echo a > trunk/a

      echo b > trunk/b

      echo c > trunk/c

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      mkdir trunk/dir

      echo e > trunk/dir/e

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      # Add a file within branches, used to confuse branch detection

      echo d > branches/notinbranch

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      svn add trunk/a trunk/b trunk/c trunk/dir branches/notinbranch

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      svn ci -m hello

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      svn up

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      # Branch to old

      svn copy trunk branches/old

      svn rm branches/old/c

        Patrick Mezard
    
convert/svn: remove dead code from entry deletion code path...

              r8884
            
      svn rm branches/old/dir

      svn ci -m "branch trunk, remove c and dir"

        Patrick Mezard
    
Rewrite svn tests using svndump...

              r7475
            
      svn up

      # Update trunk

      echo a >> trunk/a

      svn ci -m "change a"

      # Update old branch

      echo b >> branches/old/b

      svn ci -m "change b"

      # Create a cross-branch revision

      svn move trunk/b branches/old/c

      echo c >> branches/old/c

      svn ci -m "move and update c"

      # Update old branch again

      echo b >> branches/old/b

      svn ci -m "change b again"

      # Move back and forth between branch of similar names

      # This used to generate fake copy records

      svn up

      svn move branches/old branches/old2

      svn ci -m "move to old2"

      svn move branches/old2 branches/old

      svn ci -m "move back to old"

      # Update trunk again

      echo a > trunk/a

      svn ci -m "last change to a"

      # Branch again from a converted revision

      svn copy -r 1 $svnurl/trunk branches/old3

      svn ci -m "branch trunk@1 into old3"

      cd ..

      svnadmin dump svn-repo > ../branches.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 Rewrite svn tests using svndump...	r7475	#!/bin/sh
		#
		# Use this script to generate branches.svndump
		#

		mkdir temp
		cd temp

		mkdir project-orig
		cd project-orig
		mkdir trunk
		mkdir branches
		cd ..

		svnadmin create svn-repo
		svnurl=file://`pwd`/svn-repo
		svn import project-orig $svnurl -m "init projA"

		svn co $svnurl project
		cd project
		echo a > trunk/a
		echo b > trunk/b
		echo c > trunk/c
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	mkdir trunk/dir
		echo e > trunk/dir/e
Patrick Mezard Rewrite svn tests using svndump...	r7475	# Add a file within branches, used to confuse branch detection
		echo d > branches/notinbranch
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	svn add trunk/a trunk/b trunk/c trunk/dir branches/notinbranch
Patrick Mezard Rewrite svn tests using svndump...	r7475	svn ci -m hello
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	svn up
Patrick Mezard Rewrite svn tests using svndump...	r7475
		# Branch to old
		svn copy trunk branches/old
		svn rm branches/old/c
Patrick Mezard convert/svn: remove dead code from entry deletion code path...	r8884	svn rm branches/old/dir
		svn ci -m "branch trunk, remove c and dir"
Patrick Mezard Rewrite svn tests using svndump...	r7475	svn up

		# Update trunk
		echo a >> trunk/a
		svn ci -m "change a"

		# Update old branch
		echo b >> branches/old/b
		svn ci -m "change b"

		# Create a cross-branch revision
		svn move trunk/b branches/old/c
		echo c >> branches/old/c
		svn ci -m "move and update c"

		# Update old branch again
		echo b >> branches/old/b
		svn ci -m "change b again"

		# Move back and forth between branch of similar names
		# This used to generate fake copy records
		svn up
		svn move branches/old branches/old2
		svn ci -m "move to old2"
		svn move branches/old2 branches/old
		svn ci -m "move back to old"

		# Update trunk again
		echo a > trunk/a
		svn ci -m "last change to a"

		# Branch again from a converted revision
		svn copy -r 1 $svnurl/trunk branches/old3
		svn ci -m "branch trunk@1 into old3"
		cd ..

		svnadmin dump svn-repo > ../branches.svndump