upstream/mercurial-mirror Files · tests/test-remotefilelog-pull-noshallow.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-pull-noshallow.t
        
                    79 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-remotefilelog-pull-noshallow.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require no-windows

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

      Set up an extension to make sure remotefilelog clientsetup() runs

      unconditionally even if we have never used a local shallow repo.

      This mimics behavior when using remotefilelog with chg.  clientsetup() can be

      triggered due to a shallow repo, and then the code can later interact with

      non-shallow repositories.

        $ cat > setupremotefilelog.py << EOF

        > from mercurial import extensions

        > def extsetup(ui):

        >     remotefilelog = extensions.find(b'remotefilelog')

        >     remotefilelog.onetimeclientsetup(ui)

        > EOF

      Set up the master repository to pull from.

        $ hg init master

        $ cd master

        $ cat >> .hg/hgrc <<EOF

        > [remotefilelog]

        > server=True

        > EOF

        $ echo x > x

        $ hg commit -qAm x

        $ cd ..

        $ hg clone ssh://user@dummy/master child -q

      We should see the remotefilelog capability here, which advertises that

      the server supports our custom getfiles method.

        $ cd master

        $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps

        exp-remotefilelog-ssh-getfiles-1

        x_rfl_getfile

        x_rfl_getflogheads

        $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo

        exp-remotefilelog-ssh-getfiles-1

        x_rfl_getfile

        x_rfl_getflogheads

      Pull to the child repository.  Use our custom setupremotefilelog extension

      to ensure that remotefilelog.onetimeclientsetup() gets triggered.  (Without

      using chg it normally would not be run in this case since the local repository

      is not shallow.)

        $ echo y > y

        $ hg commit -qAm y

        $ cd ../child

        $ hg pull --config extensions.setuprfl=$TESTTMP/setupremotefilelog.py

        pulling from ssh://user@dummy/master

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        new changesets d34c38483be9

        (run 'hg update' to get a working copy)

        $ hg up

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

        $ cat y

        y

      Test that bundle works in a non-remotefilelog repo w/ remotefilelog loaded

        $ echo y >> y

        $ hg commit -qAm "modify y"

        $ hg bundle --base ".^" --rev . mybundle.hg --config extensions.setuprfl=$TESTTMP/setupremotefilelog.py

        1 changesets found

        $ cd ..

	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

				#require no-windows

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

				Set up an extension to make sure remotefilelog clientsetup() runs
				unconditionally even if we have never used a local shallow repo.
				This mimics behavior when using remotefilelog with chg. clientsetup() can be
				triggered due to a shallow repo, and then the code can later interact with
				non-shallow repositories.

				$ cat > setupremotefilelog.py << EOF
				> from mercurial import extensions
				> def extsetup(ui):
				> remotefilelog = extensions.find(b'remotefilelog')
				> remotefilelog.onetimeclientsetup(ui)
				> EOF

				Set up the master repository to pull from.

				$ hg init master
				$ cd master
				$ cat >> .hg/hgrc <<EOF
				> [remotefilelog]
				> server=True
				> EOF
				$ echo x > x
				$ hg commit -qAm x

				$ cd ..

				$ hg clone ssh://user@dummy/master child -q

				We should see the remotefilelog capability here, which advertises that
				the server supports our custom getfiles method.

				$ cd master
				$ echo 'hello' \| hg -R . serve --stdio \| grep capa \| identifyrflcaps
				exp-remotefilelog-ssh-getfiles-1
				x_rfl_getfile
				x_rfl_getflogheads
				$ echo 'capabilities' \| hg -R . serve --stdio \| identifyrflcaps ; echo
				exp-remotefilelog-ssh-getfiles-1
				x_rfl_getfile
				x_rfl_getflogheads


				Pull to the child repository. Use our custom setupremotefilelog extension
				to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without
				using chg it normally would not be run in this case since the local repository
				is not shallow.)

				$ echo y > y
				$ hg commit -qAm y

				$ cd ../child
				$ hg pull --config extensions.setuprfl=$TESTTMP/setupremotefilelog.py
				pulling from ssh://user@dummy/master
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				new changesets d34c38483be9
				(run 'hg update' to get a working copy)

				$ hg up
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat y
				y

				Test that bundle works in a non-remotefilelog repo w/ remotefilelog loaded

				$ echo y >> y
				$ hg commit -qAm "modify y"
				$ hg bundle --base ".^" --rev . mybundle.hg --config extensions.setuprfl=$TESTTMP/setupremotefilelog.py
				1 changesets found

				$ cd ..