view tests/test-mq-subrepo-svn.t @ 41454:d1d3094b54f9

patch: handle 0 context lines (diff.unified=0) when parsing patches

Previously, if there were no context lines, we would just keep updating the
ranges and the hunk, but not actually storing the hunk (just overwriting it each
time).  Thus a diff like this:

    $ hg diff --config diff.unified=0
    diff --git a/bar b/bar
    --- a/bar
    +++ b/bar
    @@ -1,0 +2,1 @@ 1
    +change1
    @@ -3,0 +5,1 @@ 3
    +change2

would come out of the parser like this (change1 is lost):

    bar:
    @@ -3,0 +5,1 @@ 3
    +change2

This had some really weird side effects for things like commit --interactive,
split, etc.

Differential Revision: https://phab.mercurial-scm.org/D5743

#require svn13

  $ cat <<EOF >> $HGRCPATH
  > [extensions]
  > mq =
  > [diff]
  > nodates = 1
  > [subrepos]
  > allowed = true
  > svn:allowed = true
  > EOF

fn to create new repository, and cd into it
  $ mkrepo() {
  >     hg init $1
  >     cd $1
  >     hg qinit
  > }


handle svn subrepos safely

  $ svnadmin create svn-repo-2499

  $ SVNREPOPATH=`pwd`/svn-repo-2499/project

#if py3
  $ pathquoted=`"$PYTHON" -c "import sys, urllib.parse; sys.stdout.write(urllib.parse.quote(sys.argv[1]))" "$SVNREPOPATH"`
#else
  $ pathquoted=`"$PYTHON" -c "import sys, urllib; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
#endif

#if windows
  $ SVNREPOURL=file:///$pathquoted
#else
  $ SVNREPOURL=file://$pathquoted
#endif

  $ mkdir -p svn-project-2499/trunk
  $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"

qnew on repo w/svn subrepo
  $ mkrepo repo-2499-svn-subrepo
  $ svn co "$SVNREPOURL"/trunk sub
  Checked out revision 1.
  $ echo 'sub = [svn]sub' >> .hgsub
  $ hg add .hgsub
  $ hg status -S -X '**/format'
  A .hgsub
  $ hg qnew -m0 0.diff
  $ cd sub
  $ echo a > a
  $ svn add a
  A         a
  $ svn st
  A*    a (glob)
  $ cd ..
  $ hg status -S        # doesn't show status for svn subrepos (yet)
  $ hg qnew -m1 1.diff
  abort: uncommitted changes in subrepository "sub"
  [255]

  $ cd ..