Mercurial > evolve
changeset 1035:59bc29c84ce0
evolve: hide the OBSEXC message behind a config option
This will lets most people ignore them while keep evolve dev having a close look
at them.
Some of the most useful messages will be reintroduced for all in coming
changeset.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 08 Aug 2014 17:16:29 -0700 |
| parents | 5fd28e46e8f5 |
| children | 70de12b7721a |
| files | README hgext/evolve.py tests/_exc-util.sh tests/test-corrupt.t tests/test-evolve.t tests/test-obsolete.t tests/test-sharing.t tests/test-simple4server.t tests/test-tutorial.t tests/test-wireproto.t |
| diffstat | 10 files changed, 9 insertions(+), 135 deletions(-) [+] |
line wrap: on
line diff
--- a/README Fri Aug 08 17:10:31 2014 -0700 +++ b/README Fri Aug 08 17:16:29 2014 -0700 @@ -66,6 +66,8 @@ unlikely to eventually make it into core. - push obsmarkers and phases in the same transaction than changesets (when using hg >= 3.1 and bundle2-exp is enabled) +- hide message about the obsolescence marker exchange behind a + `experimental.verbose-obsolescence-exchange` variable (default to False). 4.0.1 -- 2014-08-08
--- a/hgext/evolve.py Fri Aug 08 17:10:31 2014 -0700 +++ b/hgext/evolve.py Fri Aug 08 17:16:29 2014 -0700 @@ -2226,11 +2226,13 @@ ##################################################################### def obsexcmsg(ui, message): - message = 'OBSEXC: ' + message - ui.status(message) + if ui.configbool('experimental', 'verbose-obsolescence-exchange', False): + message = 'OBSEXC: ' + message + ui.status(message) def obsexcprg(ui, *args, **kwargs): - ui.progress('OBSEXC', *args, **kwargs) + if ui.configbool('experimental', 'verbose-obsolescence-exchange', False): + ui.progress('OBSEXC', *args, **kwargs) @command('debugobsoleterelevant',
--- a/tests/_exc-util.sh Fri Aug 08 17:10:31 2014 -0700 +++ b/tests/_exc-util.sh Fri Aug 08 17:16:29 2014 -0700 @@ -8,6 +8,8 @@ logtemplate ="{node|short} ({phase}): {desc}\n" [phases] publish=False +[experimental] +verbose-obsolescence-exchange=true [extensions] hgext.strip= hgext.rebase=
--- a/tests/test-corrupt.t Fri Aug 08 17:10:31 2014 -0700 +++ b/tests/test-corrupt.t Fri Aug 08 17:16:29 2014 -0700 @@ -111,10 +111,6 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 4 nodes - OBSEXC: pushing 2 markers (147 bytes) - OBSEXC: DONE $ hg -R ../other verify checking changesets checking manifests
--- a/tests/test-evolve.t Fri Aug 08 17:10:31 2014 -0700 +++ b/tests/test-evolve.t Fri Aug 08 17:16:29 2014 -0700 @@ -406,9 +406,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - OBSEXC: pull obsolescence markers - OBSEXC: no unknown remote markers - OBSEXC: DONE $ cd alpha $ cat << EOF > A @@ -465,10 +462,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (171 bytes) - OBSEXC: 2 markers added - OBSEXC: DONE (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:10:31 2014 -0700 +++ b/tests/test-obsolete.t Fri Aug 08 17:16:29 2014 -0700 @@ -181,10 +181,6 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files (+1 heads) - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 5 nodes - OBSEXC: pushing 2 markers (123 bytes) - OBSEXC: DONE $ hg -R ../other-new verify checking changesets checking manifests @@ -238,10 +234,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 5 nodes - OBSEXC: pushing 3 markers (184 bytes) - OBSEXC: DONE $ qlog -R ../other-new 5 - 95de7fc6918d @@ -263,10 +255,6 @@ pushing to ../other-new searching for changes no changes found - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 5 nodes - OBSEXC: pushing 3 markers (184 bytes) - OBSEXC: DONE [1] $ hg up --hidden -q .^ # 3 @@ -282,10 +270,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (245 bytes) - OBSEXC: 1 markers added - OBSEXC: DONE (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 @@ -375,10 +359,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (306 bytes) - OBSEXC: 1 markers added - OBSEXC: DONE (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior @@ -549,10 +529,6 @@ adding manifests adding file changes added 2 changesets with 1 changes to [12] files (re) - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 5 nodes - OBSEXC: pushing 7 markers (452 bytes) - OBSEXC: DONE $ hg up -q 10 $ mkcommit "obsol_d'''" created new head @@ -564,10 +540,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 5 nodes - OBSEXC: pushing 8 markers (513 bytes) - OBSEXC: DONE $ cd .. check bumped detection
--- a/tests/test-sharing.t Fri Aug 08 17:10:31 2014 -0700 +++ b/tests/test-sharing.t Fri Aug 08 17:16:29 2014 -0700 @@ -112,10 +112,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 2 nodes - OBSEXC: pushing 4 markers (341 bytes) - OBSEXC: DONE Figure SG05 $ hg -R ../public shortlog -G
--- a/tests/test-simple4server.t Fri Aug 08 17:10:31 2014 -0700 +++ b/tests/test-simple4server.t Fri Aug 08 17:16:29 2014 -0700 @@ -50,10 +50,6 @@ pulling from http://localhost:$HGPORT/ searching for changes no changes found - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in 2 nodes - OBSEXC: no unknown remote markers - OBSEXC: DONE $ hg pull -R ../other pulling from http://localhost:$HGPORT/ requesting all changes @@ -61,10 +57,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in 2 nodes - OBSEXC: no unknown remote markers - OBSEXC: DONE (run 'hg update' to get a working copy) $ hg push -R ../other pushing to http://localhost:$HGPORT/ @@ -98,20 +90,10 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files (+1 heads) - OBSEXC: computing relevant nodes - OBSEXC: looking for common markers in 2 nodes - OBSEXC: computing markers relevant to 1 nodes - OBSEXC: pushing 2 markers (171 bytes) - OBSEXC: DONE $ hg push pushing to http://localhost:$HGPORT/ searching for changes no changes found - OBSEXC: computing relevant nodes - OBSEXC: looking for common markers in [23] nodes (re) - OBSEXC: markers already in sync - OBSEXC: no marker to push - OBSEXC: DONE [1] Pull @@ -124,20 +106,11 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in [23] nodes (re) - OBSEXC: merging obsolescence markers (171 bytes) - OBSEXC: 2 markers added - OBSEXC: DONE (run 'hg heads' to see heads) $ hg -R ../other pull pulling from http://localhost:$HGPORT/ searching for changes no changes found - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in [23] nodes (re) - OBSEXC: no unknown remote markers - OBSEXC: DONE $ cd ..
--- a/tests/test-tutorial.t Fri Aug 08 17:10:31 2014 -0700 +++ b/tests/test-tutorial.t Fri Aug 08 17:16:29 2014 -0700 @@ -224,9 +224,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - OBSEXC: pull obsolescence markers - OBSEXC: no unknown remote markers - OBSEXC: DONE (run 'hg heads' to see heads, 'hg merge' to merge) I now have a new heads. Note that this remote head is immutable @@ -405,10 +402,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 5 nodes - OBSEXC: pushing 6 markers (487 bytes) - OBSEXC: DONE for simplicity sake we get the bathroom change in line again @@ -526,10 +519,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (560 bytes) - OBSEXC: 1 markers added - OBSEXC: DONE (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (public): bathroom stuff @@ -586,10 +575,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (560 bytes) - OBSEXC: 1 markers added - OBSEXC: DONE (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (draft): bathroom stuff @@ -649,10 +634,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (560 bytes) - OBSEXC: 0 markers added - OBSEXC: DONE (run 'hg heads' to see heads, 'hg merge' to merge) 1 new unstable changesets @@ -741,10 +722,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) - OBSEXC: computing relevant nodes - OBSEXC: computing markers relevant to 7 nodes - OBSEXC: pushing 10 markers (803 bytes) - OBSEXC: DONE remote get a warning that current working directory is based on an obsolete changeset @@ -753,10 +730,6 @@ pulling from $TESTTMP/local searching for changes no changes found - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (803 bytes) - OBSEXC: 0 markers added - OBSEXC: DONE working directory parent is obsolete! now let's see where we are, and update to the successor @@ -786,10 +759,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - OBSEXC: pull obsolescence markers - OBSEXC: merging obsolescence markers (803 bytes) - OBSEXC: 0 markers added - OBSEXC: DONE (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:10:31 2014 -0700 +++ b/tests/test-wireproto.t Fri Aug 08 17:16:29 2014 -0700 @@ -23,10 +23,6 @@ $ hg clone ssh://user@dummy/server client no changes found - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in 0 nodes - OBSEXC: no unknown remote markers - OBSEXC: DONE updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cp -r client other @@ -48,10 +44,6 @@ pulling from ssh://user@dummy/server searching for changes no changes found - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in 2 nodes - OBSEXC: no unknown remote markers - OBSEXC: DONE $ hg pull -R ../other pulling from ssh://user@dummy/server requesting all changes @@ -59,10 +51,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in 2 nodes - OBSEXC: no unknown remote markers - OBSEXC: DONE (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -78,11 +66,6 @@ $ hg push pushing to ssh://user@dummy/server searching for changes - OBSEXC: computing relevant nodes - OBSEXC: looking for common markers in 2 nodes - OBSEXC: computing markers relevant to 1 nodes - OBSEXC: pushing 2 markers (171 bytes) - OBSEXC: DONE remote: adding changesets remote: adding manifests remote: adding file changes @@ -91,11 +74,6 @@ pushing to ssh://user@dummy/server searching for changes no changes found - OBSEXC: computing relevant nodes - OBSEXC: looking for common markers in [23] nodes (re) - OBSEXC: markers already in sync - OBSEXC: no marker to push - OBSEXC: DONE [1] Pull @@ -108,20 +86,11 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in [23] nodes (re) - OBSEXC: merging obsolescence markers (171 bytes) - OBSEXC: 2 markers added - OBSEXC: DONE (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes no changes found - OBSEXC: pull obsolescence markers - OBSEXC: looking for common markers in [23] nodes (re) - OBSEXC: no unknown remote markers - OBSEXC: DONE $ cd ..