upstream/mercurial-mirror Files · tests/test-context.py.out

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.

Jun Wu - - Load All Authors

File last commit:

r32519:6ae068f8 default


                r41198:0101a35d

default

Download file

             test-context.py.out
        
                    50 lines
            
             | 3.6 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-context.py.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Fixed workingfilectx.date() (found by Thomas Waldmann) with test.	r4110	workingfilectx.date = (1000, 0)
Martin Geisler changelog: convert user and desc from local encoding early...	r14379	ASCII : Gr?ezi!
		Latin-1 : Gr�ezi!
		UTF-8 : Grüezi!
Martin von Zweigbergk status: update various other methods to return new class	r22914	<status modified=['foo'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
Sean Farley test-context: add test for performing a diff on a memctx...	r21837	diff --git a/foo b/foo
		--- a/foo
		+++ b/foo
		@@ -1,1 +1,2 @@
		foo
		+bar
FUJIWARA Katsunori context: cache self._status correctly at workingctx.status...	r23700	= checking context.status():
		== checking workingctx.status:
		wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: make unknown/ignored/clean of cached status empty for equivalence...	r23709	=== with "pattern match":
FUJIWARA Katsunori context: cache self._status correctly at workingctx.status...	r23700	<status modified=['bar-m'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>
		<status modified=[], added=['bar-m'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: make unknown/ignored/clean of cached status empty for equivalence...	r23709	=== with "always match" and "listclean=True":
		<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=['foo']>
		wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>
		<status modified=[], added=['bar-a', 'bar-m'], removed=[], deleted=[], unknown=[], ignored=[], clean=['foo']>
		wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: avoid breaking already fixed self._status at ctx.status()...	r23711	== checking workingcommitctx.status:
		wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		=== with "always match":
FUJIWARA Katsunori context: override _dirstatestatus in workingcommitctx for correct matching...	r23712	<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: avoid breaking already fixed self._status at ctx.status()...	r23711	wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: override _dirstatestatus in workingcommitctx for correct matching...	r23712	<status modified=[], added=['bar-a', 'bar-m', 'bar-r'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: avoid breaking already fixed self._status at ctx.status()...	r23711	wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		=== with "always match" and "listclean=True":
FUJIWARA Katsunori context: override _dirstatestatus in workingcommitctx for correct matching...	r23712	<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=['bar-r', 'foo']>
FUJIWARA Katsunori context: avoid breaking already fixed self._status at ctx.status()...	r23711	wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: override _dirstatestatus in workingcommitctx for correct matching...	r23712	<status modified=[], added=['bar-a', 'bar-m', 'bar-r'], removed=[], deleted=[], unknown=[], ignored=[], clean=['foo']>
FUJIWARA Katsunori context: avoid breaking already fixed self._status at ctx.status()...	r23711	wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
FUJIWARA Katsunori context: override _dirstatestatus in workingcommitctx for correct matching...	r23712	=== with "pattern match":
		<status modified=['bar-m'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		<status modified=[], added=['bar-m'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		=== with "pattern match" and "listclean=True":
		<status modified=[], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=['bar-r', 'foo']>
		wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
		<status modified=[], added=['bar-r'], removed=[], deleted=[], unknown=[], ignored=[], clean=['foo']>
		wcctx._status=<status modified=['bar-m'], added=['bar-a'], removed=[], deleted=[], unknown=[], ignored=[], clean=[]>
Jun Wu test-context: add a case demonstrating manifest caching problem...	r32518	== commit with manifestlog invalidated
		commit 1: 2efe531a913fa648867ab8824360371679d05a65
		commit 2: 2caca91f6362020334384ebe27bae67315298abf
		commit 3: abd6b0f49f338be22b094ef2b7425e8048f8337b

	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