upstream/mercurial-mirror Files · tests/test-issue5979.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.

Matt Harbison - - Load All Authors

File last commit:

r40405:ef6cab79 default


                r41198:0101a35d

default

Download file

             test-issue5979.t
        
                    34 lines
            
             | 658 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue5979.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Boris Feld
    
ancestors: actually iterate over ancestors in topological order (issue5979)...

              r39509
            
        $ hg init r1

        $ cd r1

        $ hg ci --config ui.allowemptycommit=true -m c0

        $ hg ci --config ui.allowemptycommit=true -m c1

        $ hg ci --config ui.allowemptycommit=true -m c2

        $ hg co -q 0

        $ hg ci --config ui.allowemptycommit=true -m c3

        created new head

        $ hg co -q 3

        $ hg merge --quiet

        $ hg ci --config ui.allowemptycommit=true -m c4

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

        @    c4

        |\

        | o  c3

        | |

        o |  c2

        | |

        o |  c1

        |/

        o  c0

        Matt Harbison
    
py3: fix module imports in tests, as flagged by test-check-module-imports.t...

              r40405
            
        >>> from mercurial import hg

        >>> from mercurial import ui as uimod

        >>> repo = hg.repository(uimod.ui())

        Boris Feld
    
ancestors: actually iterate over ancestors in topological order (issue5979)...

              r39509
            
        >>> for anc in repo.changelog.ancestors([4], inclusive=True):

        ...   print(anc)

        4

        3

        2

        1

        0

	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

Boris Feld ancestors: actually iterate over ancestors in topological order (issue5979)...	r39509	$ hg init r1
		$ cd r1
		$ hg ci --config ui.allowemptycommit=true -m c0
		$ hg ci --config ui.allowemptycommit=true -m c1
		$ hg ci --config ui.allowemptycommit=true -m c2
		$ hg co -q 0
		$ hg ci --config ui.allowemptycommit=true -m c3
		created new head
		$ hg co -q 3
		$ hg merge --quiet
		$ hg ci --config ui.allowemptycommit=true -m c4

		$ hg log -G -T'{desc}'
		@ c4
		\|\
		\| o c3
		\| \|
		o \| c2
		\| \|
		o \| c1
		\|/
		o c0


Matt Harbison py3: fix module imports in tests, as flagged by test-check-module-imports.t...	r40405	>>> from mercurial import hg
		>>> from mercurial import ui as uimod
		>>> repo = hg.repository(uimod.ui())
Boris Feld ancestors: actually iterate over ancestors in topological order (issue5979)...	r39509	>>> for anc in repo.changelog.ancestors([4], inclusive=True):
		... print(anc)
		4
		3
		2
		1
		0