upstream/mercurial-mirror Files · tests/test-absorb-phase.t

absorb: prompt user to accept absorb changes by default...

absorb: prompt user to accept absorb changes by default Change the default absorb behaviour to print the changes out and then prompt the user if they want to absorb the changes or not. Providing the `-p` option still prints the result and exits. A new `-a` option is provided which applies the changes without printing them, giving the equivalent of the old behaviour. Differential Revision: https://phab.mercurial-scm.org/D4999

Mark Thomas - - Load All Authors

File last commit:

r40226:31dfa7da default


                r40226:31dfa7da

default

Download file

             test-absorb-phase.t
        
                    30 lines
            
             | 389 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-phase.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
absorb: import extension from Facebook's hg-experimental...

              r38953
            
        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        Augie Fackler
    
tests: fix a couple of drawdag.py references...

              r39703
            
        > drawdag=$TESTDIR/drawdag.py

        Augie Fackler
    
absorb: import extension from Facebook's hg-experimental...

              r38953
            
        > EOF

        $ hg init

        $ hg debugdrawdag <<'EOS'

        > C

        > |

        > B

        > |

        > A

        > EOS

        $ hg phase -r A --public -q

        $ hg phase -r C --secret --force -q

        $ hg update C -q

        $ printf B1 > B

        Mark Thomas
    
absorb: prompt user to accept absorb changes by default...

              r40226
            
        $ hg absorb -aq

        Augie Fackler
    
absorb: import extension from Facebook's hg-experimental...

              r38953
            
        $ hg log -G -T '{desc} {phase}'

        @  C secret

        |

        o  B draft

        |

        o  A public

	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

Augie Fackler absorb: import extension from Facebook's hg-experimental...	r38953	$ cat >> $HGRCPATH << EOF
		> [extensions]
		> absorb=
Augie Fackler tests: fix a couple of drawdag.py references...	r39703	> drawdag=$TESTDIR/drawdag.py
Augie Fackler absorb: import extension from Facebook's hg-experimental...	r38953	> EOF

		$ hg init
		$ hg debugdrawdag <<'EOS'
		> C
		> \|
		> B
		> \|
		> A
		> EOS

		$ hg phase -r A --public -q
		$ hg phase -r C --secret --force -q

		$ hg update C -q
		$ printf B1 > B

Mark Thomas absorb: prompt user to accept absorb changes by default...	r40226	$ hg absorb -aq
Augie Fackler absorb: import extension from Facebook's hg-experimental...	r38953
		$ hg log -G -T '{desc} {phase}'
		@ C secret
		\|
		o B draft
		\|
		o A public