Mercurial > hg > evolve
changeset 1135:657a38cd2ae3
evolve: make the "X markers added" message during pull important
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 08 Aug 2014 17:46:20 -0700 |
| parents | 45c4739e85dc |
| children | 640f3280559e |
| files | hgext/evolve.py tests/test-evolve.t tests/test-obsolete.t tests/test-simple4server.t tests/test-tutorial.t tests/test-wireproto.t |
| diffstat | 6 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -2681,7 +2681,7 @@ if 5 < bytes: obsexcmsg(ui, "merging obsolescence markers (%i bytes)\n" % bytes) - obsexcmsg(ui, "%i markers added\n" % new) + obsexcmsg(ui, "%i markers added\n" % new, True) tr = op.gettransaction() else: obsexcmsg(ui, "no unknown remote markers\n") @@ -2696,7 +2696,7 @@ old = len(pullop.repo.obsstore._all) pullop.repo.obsstore.mergemarkers(tr, obsdata) new = len(pullop.repo.obsstore._all) - old - obsexcmsg(ui, "%i markers added\n" % new) + obsexcmsg(ui, "%i markers added\n" % new, True) else: obsexcmsg(ui, "no unknown remote markers\n") obsexcmsg(ui, "DONE\n")
--- a/tests/test-evolve.t +++ b/tests/test-evolve.t @@ -464,6 +464,7 @@ adding file changes added 1 changesets with 1 changes to 1 files pull obsolescence markers + 2 markers added (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 +++ b/tests/test-obsolete.t @@ -274,6 +274,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) pull obsolescence markers + 1 markers added (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 @@ -364,6 +365,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) pull obsolescence markers + 1 markers added (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior
--- a/tests/test-simple4server.t +++ b/tests/test-simple4server.t @@ -110,6 +110,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) pull obsolescence markers + 2 markers added (run 'hg heads' to see heads) $ hg -R ../other pull pulling from http://localhost:$HGPORT/
--- a/tests/test-tutorial.t +++ b/tests/test-tutorial.t @@ -522,6 +522,7 @@ adding file changes added 1 changesets with 1 changes to 1 files pull obsolescence markers + 1 markers added (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (public): bathroom stuff @@ -579,6 +580,7 @@ adding file changes added 1 changesets with 1 changes to 1 files pull obsolescence markers + 1 markers added (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (draft): bathroom stuff @@ -639,6 +641,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) pull obsolescence markers + 0 markers added (run 'hg heads' to see heads, 'hg merge' to merge) 1 new unstable changesets @@ -737,6 +740,7 @@ searching for changes no changes found pull obsolescence markers + 0 markers added working directory parent is obsolete! now let's see where we are, and update to the successor @@ -767,6 +771,7 @@ adding file changes added 1 changesets with 1 changes to 1 files pull obsolescence markers + 0 markers added (run 'hg update' to get a working copy) $ hg log -G o 99f039c5ec9e (draft): SPAM SPAM SPAM