Mercurial > evolve

changeset 6315:ebc2dea354a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: switch to double//slash branch in many tests We want to make sure cases with double slash in branch name will continue to be handled correctly, and for that we need more tests that use unusual branch names like this.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 30 Oct 2022 15:22:16 +0400
parents 318b81560f8c
children 80b996fbb9da
files tests/test-push-checkheads-multibranches-E1.t tests/test-push-checkheads-multibranches-E2.t tests/test-push-checkheads-multibranches-E3.t tests/test-single-head-obsolescence-named-branch-A1.t tests/test-single-head-obsolescence-named-branch-A2.t tests/test-single-head-obsolescence-named-branch-A3.t tests/test-single-head-obsolescence-named-branch-A4.t tests/test-single-head-obsolescence-named-branch-A5.t tests/test-single-head-obsolescence-topic-B2.t
diffstat 9 files changed, 68 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-push-checkheads-multibranches-E1.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E1.t	Sun Oct 30 15:22:16 2022 +0400
@@ -14,12 +14,12 @@
 .. old-state:
 ..
 .. * 1-changeset on branch default
-.. * 1-changeset on branch Z (above default)
+.. * 1-changeset on branch double//slash (above default)
 ..
 .. new-state:
 ..
 .. * 1-changeset on branch default
-.. * 1-changeset on branch Z (rebased away from A0)
+.. * 1-changeset on branch double//slash (rebased away from A0)
 ..
 .. expected-result:
 ..
@@ -46,8 +46,8 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit B0
   $ hg push --new-branch
@@ -59,8 +59,8 @@
   added 1 changesets with 1 changes to 1 files
   $ hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg branch --force Z
-  marked working directory as branch Z
+  $ hg branch --force double//slash
+  marked working directory as branch double//slash
   $ mkcommit B1
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
@@ -68,9 +68,9 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
-  @  c98b855401e7 (draft): B1
+  @  7f7cd4ea4626 (draft): B1
   |
-  | x  93e5c1321ece (draft): B0
+  | x  1fd532b11e77 (draft): B0
   | |
   | o  8aaa48160adc (draft): A0
   |/
--- a/tests/test-push-checkheads-multibranches-E2.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E2.t	Sun Oct 30 15:22:16 2022 +0400
@@ -14,12 +14,12 @@
 .. old-state:
 ..
 .. * 2-changeset on branch default
-.. * 1-changeset on branch Z (between the two other)
+.. * 1-changeset on branch double//slash (between the two other)
 ..
 .. new-state:
 ..
 .. * 2-changeset on branch default, aligned
-.. * 1-changeset on branch Z (at the same location)
+.. * 1-changeset on branch double//slash (at the same location)
 ..
 .. expected-result:
 ..
@@ -48,8 +48,8 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit B0
   $ hg branch default --force
@@ -82,9 +82,9 @@
   |
   o  f6082bc4ffef (draft): A1
   |
-  | x  afc55ba2ce61 (draft): C0
+  | x  c7f1f02ffefc (draft): C0
   | |
-  | *  93e5c1321ece (draft): B0
+  | *  1fd532b11e77 (draft): B0
   | |
   | x  8aaa48160adc (draft): A0
   |/
--- a/tests/test-push-checkheads-multibranches-E3.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-push-checkheads-multibranches-E3.t	Sun Oct 30 15:22:16 2022 +0400
@@ -14,12 +14,12 @@
 .. old-state:
 ..
 .. * 2-changeset on branch default
-.. * 1-changeset on branch Z (between the two other)
+.. * 1-changeset on branch double//slash (between the two other)
 ..
 .. new-state:
 ..
 .. * 2-changeset on branch default, on untouched, the other moved
-.. * 1-changeset on branch Z (at the same location)
+.. * 1-changeset on branch double//slash (at the same location)
 ..
 .. expected-result:
 ..
@@ -48,8 +48,8 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit B0
   $ hg branch default --force
@@ -75,9 +75,9 @@
   $ hg log -G --hidden
   @  dc44c53142f0 (draft): C1
   |
-  | x  afc55ba2ce61 (draft): C0
+  | x  c7f1f02ffefc (draft): C0
   | |
-  | o  93e5c1321ece (draft): B0
+  | o  1fd532b11e77 (draft): B0
   | |
   | o  8aaa48160adc (draft): A0
   |/
--- a/tests/test-single-head-obsolescence-named-branch-A1.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-single-head-obsolescence-named-branch-A1.t	Sun Oct 30 15:22:16 2022 +0400
@@ -15,11 +15,11 @@
 .. old-state:
 ..
 .. * 2 changesets on branch default
-.. * 2 changesets on branch Z on top of them.
+.. * 2 changesets on branch double//slash on top of them.
 ..
 .. new-state:
 ..
-.. * 2 changesets on branch Z at the same location
+.. * 2 changesets on branch double//slash at the same location
 .. * 2 changesets on branch default superseding the other ones
 ..
 .. expected-result:
@@ -28,9 +28,9 @@
 ..
 .. graph-summary:
 ..
-..   D ●      (branch Z)
+..   D ●      (branch double//slash)
 ..     |
-..   C ●      (branch Z)
+..   C ●      (branch double//slash)
 ..     |
 ..   B ø⇠◔ B'
 ..     | |
@@ -52,8 +52,8 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
   $ mkcommit B0
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit C0
   $ mkcommit D0
@@ -82,9 +82,9 @@
   |
   o  f6082bc4ffef [default] (draft): A1
   |
-  | *  cdf1dbb37a67 [Z] (draft): D0
+  | *  ce55942d01c7 [double//slash] (draft): D0
   | |
-  | *  3213e3e16c67 [Z] (draft): C0
+  | *  33628c681bad [double//slash] (draft): C0
   | |
   | x  d73caddc5533 [default] (draft): B0
   | |
--- a/tests/test-single-head-obsolescence-named-branch-A2.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-single-head-obsolescence-named-branch-A2.t	Sun Oct 30 15:22:16 2022 +0400
@@ -15,11 +15,11 @@
 .. old-state:
 ..
 .. * 2 changesets on branch default
-.. * 2 changesets on branch Z on top of them.
+.. * 2 changesets on branch double//slash on top of them.
 ..
 .. new-state:
 ..
-.. * 2 changesets on branch Z at the same location
+.. * 2 changesets on branch double//slash at the same location
 .. * 1 changeset on branch default unchanged
 .. * 1 changeset on branch default superseding the other ones
 ..
@@ -29,9 +29,9 @@
 ..
 .. graph-summary:
 ..
-..   D ●      (branch Z)
+..   D ●      (branch double//slash)
 ..     |
-..   C ●      (branch Z)
+..   C ●      (branch double//slash)
 ..     |
 ..   B ø⇠◔ B'
 ..     | |
@@ -53,8 +53,8 @@
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
   $ mkcommit B0
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit C0
   $ mkcommit D0
@@ -77,9 +77,9 @@
   $ hg log -G --hidden
   @  25c56d33e4c4 [default] (draft): B1
   |
-  | *  cdf1dbb37a67 [Z] (draft): D0
+  | *  ce55942d01c7 [double//slash] (draft): D0
   | |
-  | *  3213e3e16c67 [Z] (draft): C0
+  | *  33628c681bad [double//slash] (draft): C0
   | |
   | x  d73caddc5533 [default] (draft): B0
   | |
--- a/tests/test-single-head-obsolescence-named-branch-A3.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-single-head-obsolescence-named-branch-A3.t	Sun Oct 30 15:22:16 2022 +0400
@@ -15,11 +15,11 @@
 .. old-state:
 ..
 .. * 2 changesets on branch default
-.. * 2 changesets on branch Z interleaved with the other
+.. * 2 changesets on branch double//slash interleaved with the other
 ..
 .. new-state:
 ..
-.. * 2 changesets on branch Z at the same location
+.. * 2 changesets on branch double//slash at the same location
 .. * 2 changesets on branch default superseding the other ones
 ..
 .. expected-result:
@@ -28,11 +28,11 @@
 ..
 .. graph-summary:
 ..
-..   D ●      (branch Z)
+..   D ●      (branch double//slash)
 ..     |
 ..   C ø⇠◔ C'
 ..     | |
-..   B ● |    (branch Z)
+..   B ● |    (branch double//slash)
 ..     | |
 ..   A ø⇠◔ A'
 ..     |/
@@ -51,8 +51,8 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit B0
   $ hg branch default --force
@@ -60,8 +60,8 @@
   $ mkcommit C0
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
-  $ hg branch Z --force
-  marked working directory as branch Z
+  $ hg branch double//slash --force
+  marked working directory as branch double//slash
   $ mkcommit D0
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
@@ -90,11 +90,11 @@
   |
   o  f6082bc4ffef [default] (draft): A1
   |
-  | *  78578c4306ce [Z] (draft): D0
+  | *  d9a9b6fe977e [double//slash] (draft): D0
   | |
-  | x  afc55ba2ce61 [default] (draft): C0
+  | x  c7f1f02ffefc [default] (draft): C0
   | |
-  | *  93e5c1321ece [Z] (draft): B0
+  | *  1fd532b11e77 [double//slash] (draft): B0
   | |
   | x  8aaa48160adc [default] (draft): A0
   |/
--- a/tests/test-single-head-obsolescence-named-branch-A4.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-single-head-obsolescence-named-branch-A4.t	Sun Oct 30 15:22:16 2022 +0400
@@ -15,11 +15,11 @@
 .. old-state:
 ..
 .. * 2 changesets on branch default
-.. * 2 changesets on branch Z interleaved with the other one
+.. * 2 changesets on branch double//slash interleaved with the other one
 ..
 .. new-state:
 ..
-.. * 2 changesets on branch Z at the same location
+.. * 2 changesets on branch double//slash at the same location
 .. * 1 changeset on default untouched (the lower one)
 .. * 1 changeset on default moved on the other one
 ..
@@ -29,11 +29,11 @@
 ..
 .. graph-summary:
 ..
-..   D ●      (branch Z)
+..   D ●      (branch double//slash)
 ..     |
 ..   C ø⇠◔ C'
 ..     | |
-..   B ● |    (branch Z)
+..   B ● |    (branch double//slash)
 ..     |/
 ..   A ●
 ..     |
@@ -52,8 +52,8 @@
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd client
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit B0
   $ hg branch default --force
@@ -61,8 +61,8 @@
   $ mkcommit C0
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
-  $ hg branch Z --force
-  marked working directory as branch Z
+  $ hg branch double//slash --force
+  marked working directory as branch double//slash
   $ mkcommit D0
   created new head
   (consider using topic for lightweight branches. See 'hg help topic')
@@ -85,11 +85,11 @@
   $ hg log -G --hidden
   @  cfe9ed94fa4a [default] (draft): C1
   |
-  | *  78578c4306ce [Z] (draft): D0
+  | *  d9a9b6fe977e [double//slash] (draft): D0
   | |
-  | x  afc55ba2ce61 [default] (draft): C0
+  | x  c7f1f02ffefc [default] (draft): C0
   | |
-  | o  93e5c1321ece [Z] (draft): B0
+  | o  1fd532b11e77 [double//slash] (draft): B0
   |/
   o  8aaa48160adc [default] (draft): A0
   |
--- a/tests/test-single-head-obsolescence-named-branch-A5.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-single-head-obsolescence-named-branch-A5.t	Sun Oct 30 15:22:16 2022 +0400
@@ -15,12 +15,12 @@
 .. old-state:
 ..
 .. * 3 changesets on branch default (2 on their own branch + 1 merge)
-.. * 1 changeset on branch Z (children of the merge)
+.. * 1 changeset on branch double//slash (children of the merge)
 ..
 .. new-state:
 ..
 .. * 2 changesets on branch default (merge is obsolete) each a head
-.. * 1 changeset on branch Z keeping the merge visible
+.. * 1 changeset on branch double//slash keeping the merge visible
 ..
 .. expected-result:
 ..
@@ -28,7 +28,7 @@
 ..
 .. graph-summary:
 ..
-..   C ●      (branch Z)
+..   C ●      (branch double//slash)
 ..     |
 ..   M ⊗
 ..     |\
@@ -58,8 +58,8 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m 'M0'
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   (branches are permanent and global, did you want a bookmark?)
   $ mkcommit C0
   $ hg push --new-branch
@@ -84,7 +84,7 @@
   |
   o  f6082bc4ffef [default] (draft): A1
   |
-  | *  61c95483cc12 [Z] (draft): C0
+  | *  fa0df4a7106c [double//slash] (draft): C0
   | |
   | x    14d3d4d41d1a [default] (draft): M0
   | |\
--- a/tests/test-single-head-obsolescence-topic-B2.t	Thu May 12 20:02:40 2022 +0400
+++ b/tests/test-single-head-obsolescence-topic-B2.t	Sun Oct 30 15:22:16 2022 +0400
@@ -57,8 +57,8 @@
   changed topic on 1 changesets to "topic-X"
   $ hg strip --config extensions.strip= --hidden 'hidden()' --no-backup # clean old A0
   $ mkcommit B0
-  $ hg branch Z
-  marked working directory as branch Z
+  $ hg branch double//slash
+  marked working directory as branch double//slash
   $ hg topic topic-Y
   $ mkcommit C0
   active topic 'topic-Y' grew its first changeset
@@ -85,9 +85,9 @@
   $ hg log -G --hidden
   @  5a4735b75167 [default:topic-X] (draft): B1
   |
-  | *  02490b2dd1c5 [Z:topic-Y] (draft): D0
+  | *  3fd0fd6ca824 [double//slash:topic-Y] (draft): D0
   | |
-  | *  447ad8382abc [Z:topic-Y] (draft): C0
+  | *  5997ab5a8285 [double//slash:topic-Y] (draft): C0
   | |
   | x  1c1f62b56685 [default:topic-X] (draft): B0
   | |