##// END OF EJS Templates
rhg: add resolve_file_args to path_utils.rs...
rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

File last commit:

r51176:2cf264e9 default
r53438:f33f37ac tip default
Show More
test-obsolete-changeset-exchange.t
176 lines | 5.6 KiB | text/troff | Tads3Lexer
/ tests / test-obsolete-changeset-exchange.t
Patrick Mezard
discovery: add extinct changesets to outgoing.excluded...
r17248 Test changesets filtering during exchanges (some tests are still in
test-obsolete.t)
Durham Goode
obsolete: update tests to use obsolete options...
r22955 $ cat >> $HGRCPATH << EOF
> [experimental]
Boris Feld
config: use 'experimental.evolution.create-markers'...
r34867 > evolution.createmarkers=True
Pierre-Yves David
obsolete: introduce an `_enabled` switch to disable the feature by default...
r17296 > EOF
Pierre-Yves David
test: fix typo in test comment
r17327 Push does not corrupt remote
----------------------------
Patrick Mezard
discovery: add extinct changesets to outgoing.excluded...
r17248
Create a DAG where a changeset reuses a revision from a file first used in an
extinct changeset.
$ hg init local
$ cd local
$ echo 'base' > base
$ hg commit -Am base
adding base
$ echo 'A' > A
$ hg commit -Am A
adding A
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg revert -ar 1
adding A
$ hg commit -Am "A'"
created new head
$ hg log -G --template='{desc} {node}'
@ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
|
| o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a
|/
o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3
$ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
debugobsolete: also issue the "new obsmarkers" messsage...
r43163 1 new obsolescence markers
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Patrick Mezard
discovery: add extinct changesets to outgoing.excluded...
r17248
Push it. The bundle should not refer to the extinct changeset.
$ hg init ../other
$ hg push ../other
pushing to ../other
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
Raphaël Gomès
tests: use the `--quiet` flag for verify when applicable...
r50720 $ hg -R ../other verify -q
Pierre-Yves David
pull: fix crash when pulling changeset that get hidden locally (issue3788)...
r18498
Adding a changeset going extinct locally
------------------------------------------
Pull a changeset that will immediatly goes extinct (because you already have a
marker to obsolete him)
(test resolution of issue3788)
$ hg phase --draft --force f89bcc95eba5
$ hg phase -R ../other --draft --force f89bcc95eba5
$ hg commit --amend -m "A''"
$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5
$ hg pull ../other
pulling from ../other
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
Martin von Zweigbergk
evolution: report new unstable changesets...
r35727 1 new phase-divergent changesets
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets f89bcc95eba5
Pierre-Yves David
pull: fix crash when pulling changeset that get hidden locally (issue3788)...
r18498 (run 'hg heads' to see heads, 'hg merge' to merge)
Pierre-Yves David
test-obsolete: validate that bundle is not affected by issue3788...
r18499
check that bundle is not affected
$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg
1 changesets found
$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5
$ hg unbundle ../f89bcc95eba5.hg
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
Boris Feld
pullreport: issue a message about "extinct" pulled changesets...
r39935 (1 other changesets obsolete on arrival)
Pierre-Yves David
test-obsolete: validate that bundle is not affected by issue3788...
r18499 (run 'hg heads' to see heads)
bundle: add an experimental knob to include obsmarkers in bundle...
r32516
check-that bundle can contain markers:
Boris Feld
config: rename stabilization.bundle-obsmarker...
r34870 $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1
bundle: add an experimental knob to include obsmarkers in bundle...
r32516 1 changesets found
$ hg debugbundle ../f89bcc95eba5.hg
Augie Fackler
debugcommands: stabilize output of debugbundle by having a custom repr...
r34027 Stream params: {Compression: BZ}
Boris Feld
debugbundle: also display if a part is mandatory or advisory...
r37919 changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
bundle: add an experimental knob to include obsmarkers in bundle...
r32516 f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
Boris Feld
bundle2: mark the bundle2 part as advisory (issue5872)...
r37920 cache:rev-branch-cache -- {} (mandatory: False)
bundle: add an experimental knob to include obsmarkers in bundle...
r32516 $ hg debugbundle ../f89bcc95eba5-obs.hg
Augie Fackler
debugcommands: stabilize output of debugbundle by having a custom repr...
r34027 Stream params: {Compression: BZ}
Boris Feld
debugbundle: also display if a part is mandatory or advisory...
r37919 changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
bundle: add an experimental knob to include obsmarkers in bundle...
r32516 f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
Boris Feld
bundle2: mark the bundle2 part as advisory (issue5872)...
r37920 cache:rev-branch-cache -- {} (mandatory: False)
Boris Feld
debugbundle: also display if a part is mandatory or advisory...
r37919 obsmarkers -- {} (mandatory: True)
debugbundle: display the content of obsmarkers parts...
r32517 version: 1 (70 bytes)
9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
bundle: add an experimental knob to include obsmarkers in bundle...
r32516
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 $ cd ..
pull does not fetch excessive changesets when common node is hidden (issue4982)
-------------------------------------------------------------------------------
initial repo with server and client matching
$ hg init pull-hidden-common
$ cd pull-hidden-common
$ touch foo
$ hg -q commit -A -m initial
$ echo 1 > foo
$ hg commit -m 1
$ echo 2a > foo
$ hg commit -m 2a
$ cd ..
$ hg clone --pull pull-hidden-common pull-hidden-common-client
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 96ee1d7354c4:6a29ed9c68de
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
server obsoletes the old head
$ cd pull-hidden-common
$ hg -q up -r 1
$ echo 2b > foo
$ hg -q commit -m 2b
$ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129
debugobsolete: also issue the "new obsmarkers" messsage...
r43163 1 new obsolescence markers
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 $ cd ..
client only pulls down 1 changeset
$ cd pull-hidden-common-client
$ hg pull --debug
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pulling from $TESTTMP/pull-hidden-common
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 query 1; heads
searching for changes
Pierre-Yves David
discovery: properly filter changeset in 'peer.known' (issue4982)...
r27319 taking quick initial sample
query 2; still undecided: 2, sample size is: 2
discovery: include timing in the debug output...
r32712 2 total queries in *.????s (glob)
Pierre-Yves David
discovery: properly filter changeset in 'peer.known' (issue4982)...
r27319 1 changesets found
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 list of changesets:
bec0734cd68e84477ba7fc1d13e6cff53ab70129
listing keys for "bookmarks"
Joerg Sonnenberger
exchange: stop advertising rev-branch-cache bundle capability...
r47378 bundle2-output-bundle: "HG20", 3 parts total
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
Boris Feld
pull: use 'phase-heads' to retrieve phase information...
r34323 bundle2-output-part: "phase-heads" 24 bytes payload
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 bundle2-input-bundle: with-transaction
bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
adding changesets
add changeset bec0734cd68e
adding manifests
adding file changes
adding foo revisions
Matt Harbison
configitems: enable changegroup3 by default (unless using infinitepush)...
r51176 bundle2-input-part: total payload size 486
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 bundle2-input-part: "listkeys" (params: 1 mandatory) supported
Boris Feld
pull: use 'phase-heads' to retrieve phase information...
r34323 bundle2-input-part: "phase-heads" supported
bundle2-input-part: total payload size 24
Joerg Sonnenberger
exchange: stop advertising rev-branch-cache bundle capability...
r47378 bundle2-input-bundle: 3 parts total
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 checking for updated bookmarks
Martin von Zweigbergk
localrepo: run cache-warming transaction callback before report callback...
r35767 updating the branch cache
changegroup: move message about added changes to transaction summary...
r43167 added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets bec0734cd68e
Gregory Szorc
tests: test changegroup generation for filtered changesets (issue4982)...
r27227 (run 'hg heads' to see heads, 'hg merge' to merge)