Mercurial > hg-stable
changeset 30238:9843e3d9f4b6 stable
tests: avoid quoting of commit messages for test portability
journal extension uses util.shellquote() to record command line, but
result of it depends on runtime platform: double quotation is used on
Windows and OpenVMS, but single quotation is used otherwise.
test-journal-share.t sometimes specifies commit messages including
white space on command line. It makes journal output depend on runtime
platform, but commit message itself isn't important in this test case.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 30 Oct 2016 06:15:09 +0900 |
| parents | 94ef2f00b8a4 |
| children | 6e04f4ec4875 |
| files | tests/test-journal-share.t |
| diffstat | 1 files changed, 30 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-journal-share.t Sun Oct 30 06:15:07 2016 +0900 +++ b/tests/test-journal-share.t Sun Oct 30 06:15:09 2016 +0900 @@ -35,12 +35,12 @@ $ cd repo $ hg bookmark bm $ touch file0 - $ hg commit -Am 'file0 added' + $ hg commit -Am file0-added adding file0 $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . commit -Am 'file0 added' - 5640b525682e bm commit -Am 'file0 added' + 0fd3805711f9 . commit -Am file0-added + 0fd3805711f9 bm commit -Am file0-added A shared working copy initially receives the same bookmarks and working copy @@ -51,7 +51,7 @@ $ cd shared1 $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . share repo shared1 + 0fd3805711f9 . share repo shared1 unless you explicitly share bookmarks @@ -62,26 +62,26 @@ $ cd shared2 $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . share --bookmarks repo shared2 - 5640b525682e bm commit -Am 'file0 added' + 0fd3805711f9 . share --bookmarks repo shared2 + 0fd3805711f9 bm commit -Am file0-added Moving the bookmark in the original repository is only shown in the repository that shares bookmarks $ cd ../repo $ touch file1 - $ hg commit -Am "file1 added" + $ hg commit -Am file1-added adding file1 $ cd ../shared1 $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . share repo shared1 + 0fd3805711f9 . share repo shared1 $ cd ../shared2 $ hg journal --all previous locations of the working copy and bookmarks: - 6432d239ac5d bm commit -Am 'file1 added' - 5640b525682e . share --bookmarks repo shared2 - 5640b525682e bm commit -Am 'file0 added' + 4f354088b094 bm commit -Am file1-added + 0fd3805711f9 . share --bookmarks repo shared2 + 0fd3805711f9 bm commit -Am file0-added But working copy changes are always 'local' @@ -91,26 +91,26 @@ (leaving bookmark bm) $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . up 0 - 6432d239ac5d . commit -Am 'file1 added' - 6432d239ac5d bm commit -Am 'file1 added' - 5640b525682e . commit -Am 'file0 added' - 5640b525682e bm commit -Am 'file0 added' + 0fd3805711f9 . up 0 + 4f354088b094 . commit -Am file1-added + 4f354088b094 bm commit -Am file1-added + 0fd3805711f9 . commit -Am file0-added + 0fd3805711f9 bm commit -Am file0-added $ cd ../shared2 $ hg journal --all previous locations of the working copy and bookmarks: - 6432d239ac5d bm commit -Am 'file1 added' - 5640b525682e . share --bookmarks repo shared2 - 5640b525682e bm commit -Am 'file0 added' + 4f354088b094 bm commit -Am file1-added + 0fd3805711f9 . share --bookmarks repo shared2 + 0fd3805711f9 bm commit -Am file0-added $ hg up tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg journal previous locations of '.': - 5640b525682e up 0 - 6432d239ac5d up tip - 5640b525682e share --bookmarks repo shared2 + 0fd3805711f9 up 0 + 4f354088b094 up tip + 0fd3805711f9 share --bookmarks repo shared2 Unsharing works as expected; the journal remains consistent @@ -118,16 +118,16 @@ $ hg unshare $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . share repo shared1 + 0fd3805711f9 . share repo shared1 $ cd ../shared2 $ hg unshare $ hg journal --all previous locations of the working copy and bookmarks: - 5640b525682e . up 0 - 6432d239ac5d . up tip - 6432d239ac5d bm commit -Am 'file1 added' - 5640b525682e . share --bookmarks repo shared2 - 5640b525682e bm commit -Am 'file0 added' + 0fd3805711f9 . up 0 + 4f354088b094 . up tip + 4f354088b094 bm commit -Am file1-added + 0fd3805711f9 . share --bookmarks repo shared2 + 0fd3805711f9 bm commit -Am file0-added New journal entries in the source repo no longer show up in the other working copies @@ -135,7 +135,7 @@ $ hg bookmark newbm -r tip $ hg journal newbm previous locations of 'newbm': - 6432d239ac5d bookmark newbm -r tip + 4f354088b094 bookmark newbm -r tip $ cd ../shared2 $ hg journal newbm previous locations of 'newbm': @@ -146,7 +146,7 @@ $ hg bookmark shared2bm -r tip $ hg journal shared2bm previous locations of 'shared2bm': - 6432d239ac5d bookmark shared2bm -r tip + 4f354088b094 bookmark shared2bm -r tip $ cd ../repo $ hg journal shared2bm previous locations of 'shared2bm':