Update intro script with bdep-release commands

1 files changed, 122 insertions, 63 deletions

diff --git a/intro2-tour.orig b/intro2-tour.orig
index eb0f2cf..453282a 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -78,11 +78,10 @@ created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
-+ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello-gcc-1
++ ls -d -1 ../hello ../hello-clang ../hello-gcc
 ../hello
 ../hello-clang
 ../hello-gcc
-../hello-gcc-1
 
 + bdep init -C ../hello-vc-debug @debug cc config.cxx=cl-15 config.cc.coptions=/MDd /Z7 config.cc.loptions=/DEBUG
 initializing in project /tmp/hello/
@@ -183,7 +182,7 @@ Hello, Windows!
 + git add .
 
 + git commit -m Initial implementation
-[master (root-commit) 5003ebb] Initial implementation
+[master (root-commit) 1fb77d8] Initial implementation
  11 files changed, 99 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
@@ -201,20 +200,20 @@ Hello, Windows!
 
 + git push origin master -u --force
 To github.com:boris-kolpackov/hello.git
- + faadd78...5003ebb master -> master (forced update)
+ + ace2f6e...1fb77d8 master -> master (forced update)
 Branch 'master' set up to track remote branch 'master' from 'origin'.
 
 + bdep ci --simulate success
 submitting:
-  to:      https://ci.cppget.org
-  in:      https://github.com/boris-kolpackov/hello.git#master@5003ebb7735684a8a78c5c7dc758cb7eeaceb643
+  to:      https://ci.stage.build2.org
+  in:      https://github.com/boris-kolpackov/hello.git#master@1fb77d8ad94954bbfbecc27ccdea4298c1632f16
   package: hello
-  version: 0.1.0-a.0.20180910124221.5003ebb77356
+  version: 0.1.0-a.0.20190114103859.1fb77d8ad949
 continue? [y/n]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                  Dload  Upload   Total   Spent    Left  Speed
-
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0   480    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100   637  100   157  100   480    104    318  0:00:01  0:00:01 --:--:--   318
-CI request is queued: https://ci.cppget.org/@4a365563-03a5-4417-bfa1-1e2d4e76a9b1
-reference: 4a365563-03a5-4417-bfa1-1e2d4e76a9b1
+
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0   480    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100   643  100   163  100   480    104    306  0:00:01  0:00:01 --:--:--   306
+CI request is queued: https://ci.stage.build2.org/@0ca874e5-a059-4ca7-8ccf-fdb7616bacf7
+reference: 0ca874e5-a059-4ca7-8ccf-fdb7616bacf7
 
 + bdep deinit @gcc @clang
 deinitializing in project /tmp/hello/
@@ -258,7 +257,6 @@ prerequisite git:build2.org/hello/libprint##HEAD https://git.build2.org/hello/li
 prerequisite git:build2.org/hello/libformat##HEAD https://git.build2.org/hello/libformat.git##HEAD
 
 libhello/1.1.0
-libmhello/1.1.0
 
 + bdep status
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
@@ -270,25 +268,25 @@ trust this certificate? [y/n] hello configured 0.1.0-a.0.19700101000000 availabl
 
 + bdep sync
 synchronizing:
-  new libhello/1.0.0 (required by hello)
+  new libhello/1.0.0+1 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100% 96.7M=0s
+     0K ...                                                   100% 29.6M=0s
 + b
 synchronizing /tmp/hello-gcc/:
   upgrade hello/0.1.0-a.0.19700101000000#2
 mkdir ../hello-gcc/hello/fsdir{hello/}
-version.in ../hello-gcc/libhello-1.0.0/libhello/version.hxx.in
+version.in ../hello-gcc/libhello-1.0.0+1/libhello/version.hxx.in
+c++ ../hello-gcc/libhello-1.0.0+1/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-gcc/hello/hello/
-c++ ../hello-gcc/libhello-1.0.0/libhello/cxx{hello}
-ld ../hello-gcc/libhello-1.0.0/libhello/libs{hello}
+ld ../hello-gcc/libhello-1.0.0+1/libhello/libs{hello}
 ld ../hello-gcc/hello/hello/exe{hello}
 ln ../hello-gcc/hello/hello/exe{hello} -> hello/
 
 + bdep status -ai
 in configuration @gcc:
 hello configured 0.1.0-a.0.19700101000000#2
-  libhello ^1.0.0 configured 1.0.0
+  libhello ^1.0.0 configured 1.0.0+1
 
 in configuration @clang:
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
@@ -299,41 +297,41 @@ in configuration @gcc:
 
 in configuration @clang:
 synchronizing:
-  new libhello/1.0.0 (required by hello)
+  new libhello/1.0.0+1 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100% 97.4M=0s
+     0K ...                                                   100% 74.2M=0s
 + bdep test -ai
 in configuration @gcc:
-c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver}
-ld ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
+c++ ../hello-gcc/libhello-1.0.0+1/tests/basics/cxx{driver}
+ld ../hello-gcc/libhello-1.0.0+1/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
-test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
+test ../hello-gcc/libhello-1.0.0+1/tests/basics/exe{driver}
 
 in configuration @clang:
 mkdir ../hello-clang/hello/fsdir{hello/}
-version.in ../hello-clang/libhello-1.0.0/libhello/version.hxx.in
-c++ ../hello-clang/libhello-1.0.0/libhello/cxx{hello}
+version.in ../hello-clang/libhello-1.0.0+1/libhello/version.hxx.in
+c++ ../hello-clang/libhello-1.0.0+1/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-clang/hello/hello/
-c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver}
-ld ../hello-clang/libhello-1.0.0/libhello/libs{hello}
-ld ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
+c++ ../hello-clang/libhello-1.0.0+1/tests/basics/cxx{driver}
+ld ../hello-clang/libhello-1.0.0+1/libhello/libs{hello}
 ld ../hello-clang/hello/hello/exe{hello}
+ld ../hello-clang/libhello-1.0.0+1/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
-test ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
+test ../hello-clang/libhello-1.0.0+1/tests/basics/exe{driver}
 
 + bdep status
 hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3
 
 + bdep sync
 synchronizing:
-  drop libhello/1.0.0 (unused)
+  drop libhello/1.0.0+1 (unused)
   upgrade hello/0.1.0-a.0.19700101000000#3
 synchronizing:
-  new libhello/1.0.0 (required by hello)
+  new libhello/1.0.0+1 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#4
 
-     0K ...                                                   100%  167M=0s
+     0K ...                                                   100%  101M=0s
 + bdep fetch
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
@@ -347,7 +345,7 @@ fetching from https://git.build2.org/hello/libprint.git
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
 
 + bdep status libhello
-libhello configured 1.0.0 available [1.1.0]
+libhello configured 1.0.0+1 available [1.1.0]
 
 + bdep sync libhello
 synchronizing:
@@ -366,16 +364,16 @@ hello configured 0.1.0-a.0.19700101000000#4
     libprint ^1.0.0 configured 1.0.0
 
 + bdep status -o libhello
-libhello configured 1.1.0 available (1.1.0) [1.0.0]
+libhello configured 1.1.0 available (1.1.0) [1.0.0+1] [1.0.0]
 
 + bdep sync libhello/1.0.0
 synchronizing:
   drop libprint/1.0.0 (unused)
   drop libformat/1.0.0 (unused)
-  downgrade libhello/1.0.0
+  downgrade libhello/1.0.0+1
   reconfigure hello/0.1.0-a.0.19700101000000#4
-distributing libhello/1.0.0
 
+     0K ...                                                   100% 99.9M=0s
 + bdep new -C libextra-gcc -t lib -l c++ libextra cc config.cxx=g++
 created new library project libextra in /tmp/libextra/
 created configuration /tmp/libextra-gcc/ 1 default,forwarded,auto-synchronized
@@ -384,11 +382,11 @@ synchronizing:
 
 + b install: libextra/ config.install.root=/tmp/unpkg-gcc
 mkdir libextra-gcc/libextra/fsdir{libextra/}
+version.in libextra/libextra/version.hxx.in
 c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
 c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
-version.in libextra/libextra/version.hxx.in
-ld libextra-gcc/libextra/libextra/libs{extra}
 ar libextra-gcc/libextra/libextra/liba{extra}
+ld libextra-gcc/libextra/libextra/libs{extra}
 install unpkg-gcc/
 install unpkg-gcc/include/
 install unpkg-gcc/include/libextra/
@@ -450,35 +448,35 @@ mkdir ../hello-gcc-1/hello/fsdir{hello/}
 version.in ../hello-gcc-1/libhello-1.1.0/libhello/version.hxx.in
 version.in ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in
 version.in ../hello-gcc-1/libprint-1.0.0/libprint/version.hxx.in
-c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver}
 c++ ../hello-gcc-1/libprint-1.0.0/libprint/cxx{print}
 c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
+c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver}
 c++ ../hello-gcc-1/libhello-1.1.0/libhello/cxx{hello}
 c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
-c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
 c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver}
+c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
 ld ../hello-gcc-1/libprint-1.0.0/libprint/libs{print}
 ld ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/libformat-1.0.0/libformat/libs{format}
 ld ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/libhello-1.1.0/libhello/libs{hello}
-ld ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
 ld ../hello-gcc-1/hello/hello/exe{hello}
-test ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
-test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
+ld ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
+test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
 test ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
+test ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
 
 + b configure: ../hello-gcc/ config.cc.poptions+=-I/tmp/unpkg-gcc/include config.cc.loptions+=-L/tmp/unpkg-gcc/lib
 save ../hello-gcc/build/config.build
 save ../hello-gcc/hello/build/config.build
-save ../hello-gcc/libhello-1.0.0/build/config.build
-save ../hello-gcc/libhello-1.0.0/tests/build/config.build
+save ../hello-gcc/libhello-1.0.0+1/build/config.build
+save ../hello-gcc/libhello-1.0.0+1/tests/build/config.build
 
 + b test
-c++ ../hello-gcc/libhello-1.0.0/libhello/cxx{hello}
+c++ ../hello-gcc/libhello-1.0.0+1/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-gcc/hello/hello/
-ld ../hello-gcc/libhello-1.0.0/libhello/libs{hello}
+ld ../hello-gcc/libhello-1.0.0+1/libhello/libs{hello}
 ld ../hello-gcc/hello/hello/exe{hello}
 ln ../hello-gcc/hello/hello/exe{hello} -> hello/
 test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
@@ -487,8 +485,20 @@ test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/h
 synchronizing:
   configure sys:libsqlite3/*
   upgrade hello/0.1.0-a.0.19700101000000#5
-[master (root-commit) 9dc6e42] Initial implementation
- 11 files changed, 118 insertions(+)
+
++ bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
+created new executable project hello in /tmp/hello/
+created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
+synchronizing:
+  new hello/0.1.0-a.0.19700101000000
+error: unable to delete 'build2-control': remote ref does not exist
+error: failed to push some refs to 'git@github.com:boris-kolpackov/hello.git'
+To github.com:boris-kolpackov/hello.git
+ - [deleted]         v0.1.0-a.1
+To github.com:boris-kolpackov/hello.git
+ - [deleted]         v0.1.0
+[master (root-commit) 7d6000b] Initial implementation
+ 11 files changed, 99 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
  create mode 100644 build/bootstrap.build
@@ -500,35 +510,67 @@ synchronizing:
  create mode 100644 hello/testscript
  create mode 100644 manifest
  create mode 100644 repositories.manifest
+To github.com:boris-kolpackov/hello.git
+ + 1fb77d8...7d6000b master -> master (forced update)
+Branch 'master' set up to track remote branch 'master' from 'origin'.
 
 + bdep status
-hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180910124424.9dc6e426468f
+hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20190114104313.7d6000b7746e
 
 + b info
 project: hello
-version: 0.1.0-a.0.20180910124424.9dc6e426468f
+version: 0.1.0-a.0.20190114104313.7d6000b7746e
 summary: hello executable
 url: https://example.org/hello
 src_root: /tmp/hello/
 out_root: /tmp/hello-gcc/hello/
 amalgamation: ../
 subprojects: 
+operations: update clean test update-for-test install uninstall update-for-install
+meta-operations: perform configure disfigure dist info
 
 + bdep sync
 synchronizing:
-  upgrade hello/0.1.0-a.0.20180910124424.9dc6e426468f
+  upgrade hello/0.1.0-a.0.20190114104313.7d6000b7746e
 
 + bdep status
-hello configured 0.1.0-a.0.20180910124424.9dc6e426468f
-[master 576f0ac] Another commit
+hello configured 0.1.0-a.0.20190114104313.7d6000b7746e
+[master ea65d74] Another commit
  1 file changed, 1 insertion(+)
 
 + bdep status
-hello configured 0.1.0-a.0.20180910124424.9dc6e426468f available 0.1.0-a.0.20180910124425.576f0ac0fd29
-[master 226e8bf] Release 0.1.0
+hello configured 0.1.0-a.0.20190114104313.7d6000b7746e available 0.1.0-a.0.20190114104317.ea65d7448999
+
++ bdep release --alpha --push
+releasing:
+  package: hello
+  current: 0.1.0-a.0.z
+  release: 0.1.0-a.1
+  open:    0.1.0-a.1.z
+  commit:  yes
+  tag:     v0.1.0-a.1
+  push:    origin/master
+continue? [y/n] [master b06f00e] Release version 0.1.0-a.1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 5f59a7e] Change version to 0.1.0-a.1.z
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To github.com:boris-kolpackov/hello.git
+   7d6000b..5f59a7e  master -> master
+ * [new tag]         v0.1.0-a.1 -> v0.1.0-a.1
+
++ bdep release --no-open --push
+releasing:
+  package: hello
+  current: 0.1.0-a.1.z
+  release: 0.1.0
+  commit:  yes
+  tag:     v0.1.0
+  push:    origin/master
+continue? [y/n] [master 20c09fa] Release version 0.1.0
  1 file changed, 1 insertion(+), 1 deletion(-)
 To github.com:boris-kolpackov/hello.git
- - [deleted]         build2-control
+   5f59a7e..20c09fa  master -> master
+ * [new tag]         v0.1.0 -> v0.1.0
 
 + bdep publish --simulate success
 synchronizing:
@@ -541,19 +583,36 @@ publishing:
   project: hello
   section: alpha
   control: https://github.com/boris-kolpackov/hello.git
+warning: publishing using staged build2 toolchain
 continue? [y/n] pushing build2-control
 Counting objects: 6, done.
 Delta compression using up to 8 threads.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
-Writing objects:  16% (1/6)   
Writing objects:  33% (2/6)   
Writing objects:  50% (3/6)   
Writing objects:  66% (4/6)   
Writing objects:  83% (5/6)   
Writing objects: 100% (6/6)   
Writing objects: 100% (6/6), 467 bytes | 467.00 KiB/s, done.
+Writing objects:  16% (1/6)   
Writing objects:  33% (2/6)   
Writing objects:  50% (3/6)   
Writing objects:  66% (4/6)   
Writing objects:  83% (5/6)   
Writing objects: 100% (6/6)   
Writing objects: 100% (6/6), 466 bytes | 466.00 KiB/s, done.
 Total 6 (delta 1), reused 0 (delta 0)
+remote: 
+remote: Create a pull request for 'build2-control' on GitHub by visiting:        
+remote:      https://github.com/boris-kolpackov/hello/pull/new/build2-control        
+remote: 
 Branch 'build2-control' set up to track remote branch 'build2-control' from 'origin'.
 submitting hello-0.1.0.tar.gz
   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                  Dload  Upload   Total   Spent    Left  Speed
-
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
 95  2038    0     0  100  1956      0    928  0:00:02  0:00:02 --:--:--   928
100  2038  100    82  100  1956     38    928  0:00:02  0:00:02 --:--:--   928
-hello/0.1.0 submission is queued
-reference: ff40ea647eb3
+
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100  1879    0     0  100  1879      0    771  0:00:02  0:00:02 --:--:--   771
100  1995  100   116  100  1879     44    713  0:00:02  0:00:02 --:--:--   713
+package submission is queued: https://queue.cppget.org/hello/0.1.0
+reference: e599f0c6b6ac
+
++ bdep release --open --push
+opening:
+  package: hello
+  current: 0.1.0
+  open:    0.2.0-a.0.z
+  commit:  yes
+  push:    origin/master
+continue? [y/n] [master 1bcc569] Change version to 0.2.0-a.0.z
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To github.com:boris-kolpackov/hello.git
+   20c09fa..1bcc569  master -> master
 
 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
 created new executable project hello in /tmp/hello/
@@ -597,8 +656,8 @@ c++ ../libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
 c++ hello/cxx{hello}@../hello-gcc/hello/hello/
 c++ ../libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
 ld ../hello-gcc/libhello/libhello/libs{hello}
-ld ../hello-gcc/libhello/tests/basics/exe{driver}
 ld ../hello-gcc/hello/hello/exe{hello}
+ld ../hello-gcc/libhello/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 test ../hello-gcc/libhello/tests/basics/exe{driver}
 
@@ -650,10 +709,10 @@ c++ libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
 c++ hello/hello/cxx{hello}@../hello-gcc/hello/hello/
 c++ libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
 ld ../hello-gcc/libhello/libhello/libs{hello}
-ld ../hello-gcc/libhello/tests/basics/exe{driver}
 ld ../hello-gcc/hello/hello/exe{hello}
-test ../hello-gcc/libhello/tests/basics/exe{driver}
+ld ../hello-gcc/libhello/tests/basics/exe{driver}
 test hello/hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+test ../hello-gcc/libhello/tests/basics/exe{driver}
 
 + bpkg create -d tools cc config.cxx=g++ config.cc.coptions=-O3 config.install.root=/opt/tools config.install.sudo=sudo config.bin.rpath=/opt/tools/lib
 created new configuration in /tmp/tools/