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

absorb: make `--edit-lines` imply `--apply-changes`...

absorb: make `--edit-lines` imply `--apply-changes` One of our users tried to use `hg absorb -e` but it seemed that it would only bring up the editor if there were no changes the command could automatically detect destination for. I spent probably half an hour debugging why it worked that way. I finally figured out that it does bring up the editor, but you have to answer "yes" to the "apply changes" prompt *first*. That seems very unintuitive. If the user wants to edit the changes, there seems to be little reason to present them with a prompt first, so let's have `-e/--edit-lines` imply `-a/--apply-changes`. All the tests using `-e` also already used `-a`. I changed them to rely on the implied `-a` so we get coverage of that. Differential Revision: https://phab.mercurial-scm.org/D12550

Martin von Zweigbergk - - Load All Authors

File last commit:

r49945:0effaf9d default


                r49963:3cd57e2b

default

Download file

             test-absorb-edit-lines.t
        
                    61 lines
            
             | 996 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-edit-lines.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        > EOF

        $ hg init repo1

        $ cd repo1

      Make some commits:

        $ for i in 1 2 3; do

        >   echo $i >> a

        >   hg commit -A a -m "commit $i" -q

        > done

      absorb --edit-lines will run the editor if filename is provided:

        $ hg absorb --edit-lines

        nothing applied

        [1]

        $ HGEDITOR=cat hg absorb --edit-lines a

        HG: editing a

        HG: "y" means the line to the right exists in the changeset to the top

        HG:

        HG: /---- 4ec16f85269a commit 1

        HG: |/--- 5c5f95224a50 commit 2

        HG: ||/-- 43f0a75bede7 commit 3

        HG: |||

            yyy : 1

             yy : 2

              y : 3

        nothing applied

        [1]

      Edit the file using --edit-lines:

        $ cat > editortext << EOF

        >       y : a

        >      yy :  b

        >      y  : c

        >     yy  : d  

        >     y y : e

        >     y   : f

        >     yyy : g

        > EOF

        $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a

        $ hg cat -r 0 a

        d  

        e

        f

        g

        $ hg cat -r 1 a

         b

        c

        d  

        g

        $ hg cat -r 2 a

        a

         b

        e

        g

	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]
				> absorb=
				> EOF

				$ hg init repo1
				$ cd repo1

				Make some commits:

				$ for i in 1 2 3; do
				> echo $i >> a
				> hg commit -A a -m "commit $i" -q
				> done

				absorb --edit-lines will run the editor if filename is provided:

				$ hg absorb --edit-lines
				nothing applied
				[1]
				$ HGEDITOR=cat hg absorb --edit-lines a
				HG: editing a
				HG: "y" means the line to the right exists in the changeset to the top
				HG:
				HG: /---- 4ec16f85269a commit 1
				HG: \|/--- 5c5f95224a50 commit 2
				HG: \|\|/-- 43f0a75bede7 commit 3
				HG: \|\|\|
				yyy : 1
				yy : 2
				y : 3
				nothing applied
				[1]

				Edit the file using --edit-lines:

				$ cat > editortext << EOF
				> y : a
				> yy : b
				> y : c
				> yy : d
				> y y : e
				> y : f
				> yyy : g
				> EOF
				$ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a
				$ hg cat -r 0 a
				d
				e
				f
				g
				$ hg cat -r 1 a
				b
				c
				d
				g
				$ hg cat -r 2 a
				a
				b
				e
				g