# HG changeset patch # User Pierre-Yves David # Date 1407544801 25200 # Node ID 45c4739e85dcd33dd4468ae300ff700d6f3a66e7 # Parent bddee73b361e1e5805cb0357d81e31bfdf4bb736 evolve: make the "pulling obsolescence marker" message important This is likely to take some time the user needs to know what is going on. diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -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 diff --git a/tests/test-evolve.t b/tests/test-evolve.t --- a/tests/test-evolve.t +++ b/tests/test-evolve.t @@ -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 diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t --- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -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 diff --git a/tests/test-simple4server.t b/tests/test-simple4server.t --- a/tests/test-simple4server.t +++ b/tests/test-simple4server.t @@ -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 .. diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t --- a/tests/test-tutorial.t +++ b/tests/test-tutorial.t @@ -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 diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t --- a/tests/test-wireproto.t +++ b/tests/test-wireproto.t @@ -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 ..