Mercurial > evolve
changeset 3568:eca57332ad03
touch: include "operation" metadata in obsmarkers
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Mar 2018 15:51:34 -0700 |
| parents | 5ddea3b8d2a4 |
| children | 236d36b17aa4 |
| files | hgext3rd/evolve/cmdrewrite.py tests/test-evolve.t tests/test-touch.t tests/test-wireproto.t |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Mon Mar 12 15:51:26 2018 -0700 +++ b/hgext3rd/evolve/cmdrewrite.py Mon Mar 12 15:51:34 2018 -0700 @@ -1146,7 +1146,7 @@ if opts.get('note'): metadata['note'] = opts['note'] compat.createmarkers(repo, [(ctx, (repo[new],))], - metadata=metadata) + metadata=metadata, operation="touch") phases.retractboundary(repo, tr, ctx.phase(), [new]) if ctx in repo[None].parents(): with repo.dirstate.parentchange():
--- a/tests/test-evolve.t Mon Mar 12 15:51:26 2018 -0700 +++ b/tests/test-evolve.t Mon Mar 12 15:51:34 2018 -0700 @@ -786,14 +786,14 @@ more than 2 successors: 0 available keys: ef1: 10 - operation: 8 + operation: 10 user: 10 marker size: format v1: - smallest length: 75 + smallest length: 90 longer length: 92 median length: 91 - mean length: 87 + mean length: 91 format v0: smallest length: * (glob) longer length: * (glob)
--- a/tests/test-touch.t Mon Mar 12 15:51:26 2018 -0700 +++ b/tests/test-touch.t Mon Mar 12 15:51:34 2018 -0700 @@ -158,6 +158,6 @@ $ hg obslog -r 13 --hidden x [0-9a-f]{12} (.*) move (re) pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000) - rewritten(.*) as [0-9a-f]{12} by test (.*) (re) + rewritten(.*) as [0-9a-f]{12} using touch by test (.*) (re) note: testing with no successor
--- a/tests/test-wireproto.t Mon Mar 12 15:51:26 2018 -0700 +++ b/tests/test-wireproto.t Mon Mar 12 15:51:34 2018 -0700 @@ -141,7 +141,7 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 0 changes to 1 files (+1 heads) - remote: obsmarker-exchange: 167 bytes received + remote: obsmarker-exchange: 183 bytes received remote: 1 new obsolescence markers remote: obsoleted 1 changesets $ hg -R ../other pull @@ -151,7 +151,7 @@ adding manifests adding file changes added 1 changesets with 0 changes to 1 files (+1 heads) - obsmarker-exchange: 167 bytes received + obsmarker-exchange: 183 bytes received 1 new obsolescence markers obsoleted 1 changesets new changesets * (glob) @@ -177,7 +177,7 @@ (skipping discovery of obsolescence markers, will exchange everything) (controled by 'experimental.evolution.obsdiscovery' configuration) no changes found - remote: obsmarker-exchange: 258 bytes received + remote: obsmarker-exchange: 274 bytes received [1] $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no pulling from ssh://user@dummy/server @@ -185,7 +185,7 @@ no changes found (skipping discovery of obsolescence markers, will exchange everything) (controled by 'experimental.evolution.obsdiscovery' configuration) - obsmarker-exchange: 258 bytes received + obsmarker-exchange: 274 bytes received $ cd .. @@ -215,7 +215,7 @@ pulling from http://localhost:$HGPORT/ searching for changes no changes found - obsmarker-exchange: 258 bytes received + obsmarker-exchange: 274 bytes received $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers pulling from http://localhost:$HGPORT/