Mercurial > hg > evolve
changeset 1138:86bd794f6037
evolve: stop pretending we are pulling markers when we don't
If discovery did not found any unknown marker, we should not display the
"pulling marker" message.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 08 Aug 2014 18:06:08 -0700 |
| parents | 7632f1f79946 |
| children | 6a7d34010f8f |
| files | hgext/evolve.py tests/test-simple4server.t tests/test-wireproto.t |
| diffstat | 3 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -2656,12 +2656,12 @@ return None # remote opted out of obsolescence marker exchange tr = None ui = pullop.repo.ui - obsexcmsg(ui, "pull obsolescence markers\n", True) boundaries = _buildpullobsmerkersboundaries(pullop) if not set(boundaries['heads']) - set(boundaries['common']): obsexcmsg(ui, "nothing to pull\n") return None + obsexcmsg(ui, "pull obsolescence markers\n", True) new = 0 if b2xpull:
--- a/tests/test-simple4server.t +++ b/tests/test-simple4server.t @@ -50,7 +50,6 @@ 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 @@ -116,7 +115,6 @@ pulling from http://localhost:$HGPORT/ searching for changes no changes found - pull obsolescence markers $ cd ..
--- a/tests/test-wireproto.t +++ b/tests/test-wireproto.t @@ -23,7 +23,6 @@ $ 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 @@ -45,7 +44,6 @@ 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 @@ -97,7 +95,6 @@ pulling from ssh://user@dummy/server searching for changes no changes found - pull obsolescence markers $ cd ..