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

r40758:0800d9e6 default


                r41198:0101a35d

default

Download file

             test-remotefilelog-bundle2.t
        
                    78 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-remotefilelog-bundle2.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Harbison
    
tests: disable remotefilelog on Windows...

              r40758
            
      #require no-windows

        Augie Fackler
    
remotefilelog: import pruned-down remotefilelog extension from hg-experimental...

              r40530
            
        $ . "$TESTDIR/remotefilelog-library.sh"

        Martin von Zweigbergk
    
tests: drop obsolete "hginit" alias in remotefilelog tests...

              r40605
            
        $ hg init master

        Augie Fackler
    
remotefilelog: import pruned-down remotefilelog extension from hg-experimental...

              r40530
            
        $ grep generaldelta master/.hg/requires

        generaldelta

        $ cd master

      preferuncompressed = False so that we can make both generaldelta and non-generaldelta clones

        $ cat >> .hg/hgrc <<EOF

        > [remotefilelog]

        > server=True

        > [experimental]

        > bundle2-exp = True

        > [server]

        > preferuncompressed = False

        > EOF

        $ echo x > x

        $ hg commit -qAm x

        $ cd ..

        $ hgcloneshallow ssh://user@dummy/master shallow-generaldelta -q --pull --config experimental.bundle2-exp=True

        1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

        $ grep generaldelta shallow-generaldelta/.hg/requires

        generaldelta

        $ hgcloneshallow ssh://user@dummy/master shallow-plain -q --pull --config format.usegeneraldelta=False --config format.generaldelta=False --config experimental.bundle2-exp=True

        $ grep generaldelta shallow-plain/.hg/requires

        [1]

        $ cd master

        $ echo a > a

        $ hg commit -qAm a

      pull from generaldelta to generaldelta

        $ cd ../shallow-generaldelta

        $ hg pull -u

        pulling from ssh://user@dummy/master

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files

        new changesets 2fbb8bb2b903

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

      push from generaldelta to generaldelta

        $ echo b > b

        $ hg commit -qAm b

        $ hg push

        pushing to ssh://user@dummy/master

        searching for changes

        remote: adding changesets

        remote: adding manifests

        remote: adding file changes

        remote: added 1 changesets with 1 changes to 1 files

      pull from generaldelta to non-generaldelta

        $ cd ../shallow-plain

        $ hg pull -u

        pulling from ssh://user@dummy/master

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 0 changes to 0 files

        new changesets 2fbb8bb2b903:d6788bd632ca

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)

      push from non-generaldelta to generaldelta

        $ echo c > c

        $ hg commit -qAm c

        $ hg push

        pushing to ssh://user@dummy/master

        searching for changes

        remote: adding changesets

        remote: adding manifests

        remote: adding file changes

        remote: added 1 changesets with 1 changes to 1 files

	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

Matt Harbison tests: disable remotefilelog on Windows...	r40758	#require no-windows

Augie Fackler remotefilelog: import pruned-down remotefilelog extension from hg-experimental...	r40530	$ . "$TESTDIR/remotefilelog-library.sh"

Martin von Zweigbergk tests: drop obsolete "hginit" alias in remotefilelog tests...	r40605	$ hg init master
Augie Fackler remotefilelog: import pruned-down remotefilelog extension from hg-experimental...	r40530	$ grep generaldelta master/.hg/requires
		generaldelta
		$ cd master
		preferuncompressed = False so that we can make both generaldelta and non-generaldelta clones
		$ cat >> .hg/hgrc <<EOF
		> [remotefilelog]
		> server=True
		> [experimental]
		> bundle2-exp = True
		> [server]
		> preferuncompressed = False
		> EOF
		$ echo x > x
		$ hg commit -qAm x

		$ cd ..

		$ hgcloneshallow ssh://user@dummy/master shallow-generaldelta -q --pull --config experimental.bundle2-exp=True
		1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
		$ grep generaldelta shallow-generaldelta/.hg/requires
		generaldelta
		$ hgcloneshallow ssh://user@dummy/master shallow-plain -q --pull --config format.usegeneraldelta=False --config format.generaldelta=False --config experimental.bundle2-exp=True
		$ grep generaldelta shallow-plain/.hg/requires
		[1]

		$ cd master
		$ echo a > a
		$ hg commit -qAm a

		pull from generaldelta to generaldelta
		$ cd ../shallow-generaldelta
		$ hg pull -u
		pulling from ssh://user@dummy/master
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 0 changes to 0 files
		new changesets 2fbb8bb2b903
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
		push from generaldelta to generaldelta
		$ echo b > b
		$ hg commit -qAm b
		$ hg push
		pushing to ssh://user@dummy/master
		searching for changes
		remote: adding changesets
		remote: adding manifests
		remote: adding file changes
		remote: added 1 changesets with 1 changes to 1 files
		pull from generaldelta to non-generaldelta
		$ cd ../shallow-plain
		$ hg pull -u
		pulling from ssh://user@dummy/master
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 0 changes to 0 files
		new changesets 2fbb8bb2b903:d6788bd632ca
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
		push from non-generaldelta to generaldelta
		$ echo c > c
		$ hg commit -qAm c
		$ hg push
		pushing to ssh://user@dummy/master
		searching for changes
		remote: adding changesets
		remote: adding manifests
		remote: adding file changes
		remote: added 1 changesets with 1 changes to 1 files