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

phabricator: warn if unable to amend, instead of aborting after posting...

phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

Mark Thomas - - Load All Authors

File last commit:

r40226:31dfa7da default


                r41198:0101a35d

default

Download file

             test-absorb-edit-lines.t
        
                    61 lines
            
             | 1.0 KiB
            
                | 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 --apply-changes

        nothing applied

        [1]

        $ HGEDITOR=cat hg absorb --edit-lines --apply-changes 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 --apply-changes 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 --apply-changes
				nothing applied
				[1]
				$ HGEDITOR=cat hg absorb --edit-lines --apply-changes 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 --apply-changes 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