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

subrepos: abort commit by default if a subrepo is dirty (BC)...

subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g

Matt Mackall - - Load All Authors

File last commit:

r12528:f6b20641 default


                r15321:e174353e

stable

Download file

             test-convert-datesort.t
        
                    117 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-datesort.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > convert=

        > graphlog=

        > EOF

        $ hg init t

        $ cd t

        $ echo a >> a

        $ hg ci -Am a0 -d '1 0'

        adding a

        $ hg branch brancha

        marked working directory as branch brancha

        $ echo a >> a

        $ hg ci -m a1 -d '2 0'

        $ echo a >> a

        $ hg ci -m a2 -d '3 0'

        $ echo a >> a

        $ hg ci -m a3 -d '4 0'

        $ hg up -C 0

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

        $ hg branch branchb

        marked working directory as branch branchb

        $ echo b >> b

        $ hg ci -Am b0 -d '6 0'

        adding b

        $ hg up -C brancha

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

        $ echo a >> a

        $ hg ci -m a4 -d '5 0'

        $ echo a >> a

        $ hg ci -m a5 -d '7 0'

        $ echo a >> a

        $ hg ci -m a6 -d '8 0'

        $ hg up -C branchb

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ echo b >> b

        $ hg ci -m b1 -d '9 0'

        $ cd ..

      convert with datesort

        $ hg convert --datesort t t-datesort

        initializing destination t-datesort repository

        scanning source...

        sorting...

        converting...

        8 a0

        7 a1

        6 a2

        5 a3

        4 a4

        3 b0

        2 a5

        1 a6

        0 b1

      graph converted repo

        $ hg -R t-datesort glog --template '{rev} "{desc}"\n'

        o  8 "b1"

        |

        | o  7 "a6"

        | |

        | o  6 "a5"

        | |

        o |  5 "b0"

        | |

        | o  4 "a4"

        | |

        | o  3 "a3"

        | |

        | o  2 "a2"

        | |

        | o  1 "a1"

        |/

        o  0 "a0"

      convert with datesort (default mode)

        $ hg convert t t-sourcesort

        initializing destination t-sourcesort repository

        scanning source...

        sorting...

        converting...

        8 a0

        7 a1

        6 a2

        5 a3

        4 b0

        3 a4

        2 a5

        1 a6

        0 b1

      graph converted repo

        $ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'

        o  8 "b1"

        |

        | o  7 "a6"

        | |

        | o  6 "a5"

        | |

        | o  5 "a4"

        | |

        o |  4 "b0"

        | |

        | o  3 "a3"

        | |

        | o  2 "a2"

        | |

        | o  1 "a1"

        |/

        o  0 "a0"

	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


				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> convert=
				> graphlog=
				> EOF
				$ hg init t
				$ cd t
				$ echo a >> a
				$ hg ci -Am a0 -d '1 0'
				adding a
				$ hg branch brancha
				marked working directory as branch brancha
				$ echo a >> a
				$ hg ci -m a1 -d '2 0'
				$ echo a >> a
				$ hg ci -m a2 -d '3 0'
				$ echo a >> a
				$ hg ci -m a3 -d '4 0'
				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg branch branchb
				marked working directory as branch branchb
				$ echo b >> b
				$ hg ci -Am b0 -d '6 0'
				adding b
				$ hg up -C brancha
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo a >> a
				$ hg ci -m a4 -d '5 0'
				$ echo a >> a
				$ hg ci -m a5 -d '7 0'
				$ echo a >> a
				$ hg ci -m a6 -d '8 0'
				$ hg up -C branchb
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo b >> b
				$ hg ci -m b1 -d '9 0'
				$ cd ..

				convert with datesort

				$ hg convert --datesort t t-datesort
				initializing destination t-datesort repository
				scanning source...
				sorting...
				converting...
				8 a0
				7 a1
				6 a2
				5 a3
				4 a4
				3 b0
				2 a5
				1 a6
				0 b1

				graph converted repo

				$ hg -R t-datesort glog --template '{rev} "{desc}"\n'
				o 8 "b1"
				\|
				\| o 7 "a6"
				\| \|
				\| o 6 "a5"
				\| \|
				o \| 5 "b0"
				\| \|
				\| o 4 "a4"
				\| \|
				\| o 3 "a3"
				\| \|
				\| o 2 "a2"
				\| \|
				\| o 1 "a1"
				\|/
				o 0 "a0"


				convert with datesort (default mode)

				$ hg convert t t-sourcesort
				initializing destination t-sourcesort repository
				scanning source...
				sorting...
				converting...
				8 a0
				7 a1
				6 a2
				5 a3
				4 b0
				3 a4
				2 a5
				1 a6
				0 b1

				graph converted repo

				$ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
				o 8 "b1"
				\|
				\| o 7 "a6"
				\| \|
				\| o 6 "a5"
				\| \|
				\| o 5 "a4"
				\| \|
				o \| 4 "b0"
				\| \|
				\| o 3 "a3"
				\| \|
				\| o 2 "a2"
				\| \|
				\| o 1 "a1"
				\|/
				o 0 "a0"