evolve: make the "pulling obsolescence marker" message important
This is likely to take some time the user needs to know what is going on.
--- a/hgext/evolve.py Fri Aug 08 17:34:22 2014 -0700
+++ b/hgext/evolve.py Fri Aug 08 17:40:01 2014 -0700
@@ -2656,7 +2656,7 @@
return None # remote opted out of obsolescence marker exchange
tr = None
ui = pullop.repo.ui
- obsexcmsg(ui, "pull obsolescence markers\n")
+ obsexcmsg(ui, "pull obsolescence markers\n", True)
boundaries = _buildpullobsmerkersboundaries(pullop)
new = 0
--- a/tests/test-evolve.t Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-evolve.t Fri Aug 08 17:40:01 2014 -0700
@@ -406,6 +406,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
$ cd alpha
$ cat << EOF > A
@@ -462,6 +463,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
(run 'hg update' to get a working copy)
$ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-obsolete.t Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-obsolete.t Fri Aug 08 17:40:01 2014 -0700
@@ -273,6 +273,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ pull obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
$ qlog -R ../other-new
6
@@ -362,6 +363,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ pull obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q 7 # to check rollback update behavior
--- a/tests/test-simple4server.t Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-simple4server.t Fri Aug 08 17:40:01 2014 -0700
@@ -50,6 +50,7 @@
pulling from http://localhost:$HGPORT/
searching for changes
no changes found
+ pull obsolescence markers
$ hg pull -R ../other
pulling from http://localhost:$HGPORT/
requesting all changes
@@ -57,6 +58,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ pull obsolescence markers
(run 'hg update' to get a working copy)
$ hg push -R ../other
pushing to http://localhost:$HGPORT/
@@ -107,11 +109,13 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ pull obsolescence markers
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from http://localhost:$HGPORT/
searching for changes
no changes found
+ pull obsolescence markers
$ cd ..
--- a/tests/test-tutorial.t Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-tutorial.t Fri Aug 08 17:40:01 2014 -0700
@@ -224,6 +224,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ pull obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
I now have a new heads. Note that this remote head is immutable
@@ -520,6 +521,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (public): bathroom stuff
@@ -576,6 +578,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (draft): bathroom stuff
@@ -635,6 +638,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ pull obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
1 new unstable changesets
@@ -732,6 +736,7 @@
pulling from $TESTTMP/local
searching for changes
no changes found
+ pull obsolescence markers
working directory parent is obsolete!
now let's see where we are, and update to the successor
@@ -761,6 +766,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
(run 'hg update' to get a working copy)
$ hg log -G
o 99f039c5ec9e (draft): SPAM SPAM SPAM
--- a/tests/test-wireproto.t Fri Aug 08 17:34:22 2014 -0700
+++ b/tests/test-wireproto.t Fri Aug 08 17:40:01 2014 -0700
@@ -23,6 +23,7 @@
$ hg clone ssh://user@dummy/server client
no changes found
+ pull obsolescence markers
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cp -r client other
@@ -44,6 +45,7 @@
pulling from ssh://user@dummy/server
searching for changes
no changes found
+ pull obsolescence markers
$ hg pull -R ../other
pulling from ssh://user@dummy/server
requesting all changes
@@ -51,6 +53,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ pull obsolescence markers
(run 'hg update' to get a working copy)
$ hg push -R ../other
pushing to ssh://user@dummy/server
@@ -87,11 +90,13 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ pull obsolescence markers
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from ssh://user@dummy/server
searching for changes
no changes found
+ pull obsolescence markers
$ cd ..