upstream/mercurial-mirror Files · tests/test-convert-clonebranches.t

doc: unify section level between help topics...

doc: unify section level between help topics Some help topics use "-" for the top level underlining section mark, but "-" is used also for the top level categorization in generated documents: "hg.1.html", for example. So, TOC in such documents contain "sections in each topics", too. This patch changes underlining section mark in some help topics to unify section level in generated documents. After this patching, levels of each section marks are: level0 """""" level1 ====== level2 ------ level3 ...... level4 ###### And use of section markers in each documents are: - mercurial/help/*.txt can use level1 or more (now these use level1 and level2) - help for core commands can use level2 or more (now these use no section marker) - descriptions of extensions can use level2 or more (now hgext/acl uses level2) - help for commands defined in extension can use level4 or more (now "convert" of hgext/convert uses level4) "Level0" is used as top level categorization only in "doc/hg.1.txt" and the intermediate file generated by "doc/gendoc.py", so end users don't see it in "hg help" outoput and so on.

Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable


                r17267:979b107e

stable

Download file

             test-convert-clonebranches.t
        
                    88 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-clonebranches.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "convert = " >> $HGRCPATH

        $ echo "[convert]" >> $HGRCPATH

        $ echo "hg.tagsbranch=0" >> $HGRCPATH

        $ hg init source

        $ cd source

        $ echo a > a

        $ hg ci -qAm adda

      Add a merge with one parent in the same branch

        $ echo a >> a

        $ hg ci -qAm changea

        $ hg up -qC 0

        $ hg branch branch0

        marked working directory as branch branch0

        (branches are permanent and global, did you want a bookmark?)

        $ echo b > b

        $ hg ci -qAm addb

        $ hg up -qC

        $ hg merge default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg ci -qm mergeab

        $ hg tag -ql mergeab

        $ cd ..

      Miss perl... sometimes

        $ cat > filter.py <<EOF

        > import sys, re

        > 

        > r = re.compile(r'^(?:\d+|pulling from)')

        > sys.stdout.writelines([l for l in sys.stdin if r.search(l)])

        > EOF

      convert

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     python filter.py

        3 adda

        2 changea

        1 addb

        pulling from default into branch0

        1 changesets found

        0 mergeab

        pulling from default into branch0

        1 changesets found

      Add a merge with both parents and child in different branches

        $ cd source

        $ hg branch branch1

        marked working directory as branch branch1

        (branches are permanent and global, did you want a bookmark?)

        $ echo a > file1

        $ hg ci -qAm c1

        $ hg up -qC mergeab

        $ hg branch branch2

        marked working directory as branch branch2

        (branches are permanent and global, did you want a bookmark?)

        $ echo a > file2

        $ hg ci -qAm c2

        $ hg merge branch1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg branch branch3

        marked working directory as branch branch3

        (branches are permanent and global, did you want a bookmark?)

        $ hg ci -qAm c3

        $ cd ..

      incremental conversion

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     python filter.py

        2 c1

        pulling from branch0 into branch1

        4 changesets found

        1 c2

        pulling from branch0 into branch2

        4 changesets found

        0 c3

        pulling from branch2 into branch3

        5 changesets found

        pulling from branch1 into branch3

        1 changesets found

	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


				$ echo "[extensions]" >> $HGRCPATH
				$ echo "convert = " >> $HGRCPATH
				$ echo "[convert]" >> $HGRCPATH
				$ echo "hg.tagsbranch=0" >> $HGRCPATH
				$ hg init source
				$ cd source
				$ echo a > a
				$ hg ci -qAm adda

				Add a merge with one parent in the same branch

				$ echo a >> a
				$ hg ci -qAm changea
				$ hg up -qC 0
				$ hg branch branch0
				marked working directory as branch branch0
				(branches are permanent and global, did you want a bookmark?)
				$ echo b > b
				$ hg ci -qAm addb
				$ hg up -qC
				$ hg merge default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -qm mergeab
				$ hg tag -ql mergeab
				$ cd ..

				Miss perl... sometimes

				$ cat > filter.py <<EOF
				> import sys, re
				>
				> r = re.compile(r'^(?:\d+\|pulling from)')
				> sys.stdout.writelines([l for l in sys.stdin if r.search(l)])
				> EOF

				convert

				$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
				> python filter.py
				3 adda
				2 changea
				1 addb
				pulling from default into branch0
				1 changesets found
				0 mergeab
				pulling from default into branch0
				1 changesets found

				Add a merge with both parents and child in different branches

				$ cd source
				$ hg branch branch1
				marked working directory as branch branch1
				(branches are permanent and global, did you want a bookmark?)
				$ echo a > file1
				$ hg ci -qAm c1
				$ hg up -qC mergeab
				$ hg branch branch2
				marked working directory as branch branch2
				(branches are permanent and global, did you want a bookmark?)
				$ echo a > file2
				$ hg ci -qAm c2
				$ hg merge branch1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg branch branch3
				marked working directory as branch branch3
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -qAm c3
				$ cd ..

				incremental conversion

				$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
				> python filter.py
				2 c1
				pulling from branch0 into branch1
				4 changesets found
				1 c2
				pulling from branch0 into branch2
				4 changesets found
				0 c3
				pulling from branch2 into branch3
				5 changesets found
				pulling from branch1 into branch3
				1 changesets found