##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

File last commit:

r23172:e955549c default
r23524:a1a7c94d default
Show More
test-mq-subrepo-svn.t
56 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-mq-subrepo-svn.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require svn13
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [diff]
> nodates = 1
> EOF
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Kevin Bullock
test-subrepo-mq-svn.t: correct comment...
r13326 fn to create new repository, and cd into it
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ mkrepo() {
> hg init $1
> cd $1
> hg qinit
> }
handle svn subrepos safely
$ svnadmin create svn-repo-2499
Mads Kiilerich
tests: cleanup of svn url handling...
r17033
$ SVNREPOPATH=`pwd`/svn-repo-2499/project
#if windows
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
r22947 $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 #else
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
r22947 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 #endif
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ mkdir -p svn-project-2499/trunk
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 $ svn import -m 'init project' svn-project-2499 "$SVNREPOURL"
Eduard-Cristian Stefan
test-mq-subrepo-svn: enable for Windows
r16894 Adding svn-project-2499/trunk (glob)
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Committed revision 1.
qnew on repo w/svn subrepo
$ mkrepo repo-2499-svn-subrepo
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 $ svn co "$SVNREPOURL"/trunk sub
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 Checked out revision 1.
$ echo 'sub = [svn]sub' >> .hgsub
$ hg add .hgsub
Matt Mackall
tests: fixes for svn 1.4.2
r13410 $ hg status -S -X '**/format'
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 A .hgsub
$ hg qnew -m0 0.diff
$ cd sub
$ echo a > a
$ svn add a
A a
$ svn st
Matt Mackall
tests: fixes for svn 1.4.2
r13410 A* a (glob)
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ cd ..
$ hg status -S # doesn't show status for svn subrepos (yet)
$ hg qnew -m1 1.diff
abort: uncommitted changes in subrepository sub
[255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..