tests: add missing accept of native pathname separator

This commit is contained in:
Mads Kiilerich 2012-04-28 01:55:39 +02:00
parent 8639b8b9e3
commit d94d866bcb
5 changed files with 10 additions and 10 deletions

View File

@ -111,7 +111,7 @@ plain headers
abort: "#" cannot be used in the name of a patch
abort: ":" cannot be used in the name of a patch
% qnew with name containing slash
abort: path ends in directory separator: foo/
abort: path ends in directory separator: foo/ (glob)
abort: "foo" already exists as a directory
foo/bar.patch
popping foo/bar.patch
@ -178,7 +178,7 @@ hg headers
abort: "#" cannot be used in the name of a patch
abort: ":" cannot be used in the name of a patch
% qnew with name containing slash
abort: path ends in directory separator: foo/
abort: path ends in directory separator: foo/ (glob)
abort: "foo" already exists as a directory
foo/bar.patch
popping foo/bar.patch

View File

@ -286,25 +286,25 @@ Check rebasing public changeset
Check rebasing mutable changeset
Source phase greater or equal to destination phase: new changeset get the phase of source:
$ hg rebase -s9 -d0
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
draft
$ hg rebase -s9 -d1
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
draft
$ hg phase --force --secret 9
$ hg rebase -s9 -d0
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret
$ hg rebase -s9 -d1
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret
Source phase lower than destination phase: new changeset get the phase of destination:
$ hg rebase -s7 -d9
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c9659aac0000-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret

View File

@ -283,7 +283,7 @@ Test hg-ssh:
$ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP/a repo\"" "ssh://user@dummy/a repo"
3fb238f49e8c
$ SSH_ORIGINAL_COMMAND="'hg' -R 'a repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo"
remote: Illegal repository '$TESTTMP/a repo'
remote: Illegal repository '$TESTTMP/a repo' (glob)
abort: no suitable response from remote hg!
[255]
$ SSH_ORIGINAL_COMMAND="'hg' -R 'a'repo' serve --stdio" hg id --ssh "python \"$TESTDIR\"/../contrib/hg-ssh \"$TESTTMP\"" "ssh://user@dummy/a repo"

View File

@ -197,7 +197,7 @@ Test explicit path commands within subrepos: add/forget
$ hg status -S
? foo/bar/z2.txt
$ hg forget foo/bar/z2.txt
not removing foo/bar/z2.txt: file is already untracked
not removing foo/bar/z2.txt: file is already untracked (glob)
[1]
$ hg status -S
? foo/bar/z2.txt

View File

@ -43,7 +43,7 @@ Revert subrepo and test subrepo fileset keyword:
$ echo b > s/a
$ hg revert "set:subrepo('glob:s*')"
reverting subrepo s
reverting s/a
reverting s/a (glob)
$ rm s/a.orig
Revert subrepo with no backup. The "reverting s/a" line is gone since