test: update output to 02fdb8c018aa
Now that we have directaccess in core, we get a new warning message when
updating to a hidden changeset. Update the tests.
CORE-TEST-OUTPUT-UPDATE: 02fdb8c018aa
$."$TESTDIR/testlib/topic_setup.sh"Testingtheconfigknobtoforbiduntopicedcommit======================================================$hginit$TESTTMP/untopic-commit$cd$TESTTMP/untopic-commit$cat<<EOF>>.hg/hgrc>[phases]>publish=false>EOF$cat<<EOF>>$HGRCPATH>[experimental]>topic-mode=enforce>EOF$touchabcd$hgadda$hgci-m"Added a"abort:noactivetopic(see'hg help -e topic.topic-mode'fordetails)[255](sametest,checkingweabortbeforetheeditor)$EDITOR=cathgci-m"Added a"--editabort:noactivetopic(see'hg help -e topic.topic-mode'fordetails)[255]$hgci-m"added a"--configexperimental.topic-mode=ignore$hglogchangeset:0:a154386e50d1tag:tipuser:testdate:ThuJan0100:00:001970+0000summary:addedaTestingtheconfigknobtowarnaboutuntopicedcommit==========================================================$hginit$TESTTMP/untopic-warn-commit$cd$TESTTMP/untopic-warn-commit$cat<<EOF>>.hg/hgrc>[phases]>publish=false>EOF$cat<<EOF>>$HGRCPATH>[experimental]>topic-mode=warning>EOF$touchabcd$hgadda(sametest,checkingweabortbeforetheeditor)$HGEDITOR=cathgci-m"Added a"--editwarning:newdraftcommitwithouttopic(see'hg help -e topic.topic-mode'fordetails)AddedaHG:Entercommitmessage.Linesbeginningwith'HG:'areremoved.HG:Leavemessageemptytoabortcommit.HG:--HG:user:testHG:branch'default'HG:addeda$HGEDITOR=cathgci--amend-m"Added a"--editAddedaHG:Entercommitmessage.Linesbeginningwith'HG:'areremoved.HG:Leavemessageemptytoabortcommit.HG:--HG:user:testHG:branch'default'HG:addeda$hgci--amend-m"added a'"--configexperimental.topic-mode=ignore$hglogchangeset:2:2e862d8b5efftag:tipparent:-1:000000000000user:testdate:ThuJan0100:00:001970+0000summary:addeda'Testing the config knob to warn about untopiced merge commit================================================================ $ hg init $TESTTMP/test-untopic-merge-commit $ cd $TESTTMP/test-untopic-merge-commit $ cat <<EOF>> .hg/hgrc > [phases] > publish=false > EOF $ cat <<EOF>> $HGRCPATH > [experimental] > topic-mode = enforce > EOF $ touch ROOT $ hg commit -A -m "ROOT" --config experimental.topic-mode=ignore adding ROOT $ touch a $ hg add a $ hg topic mytopic marked working directory as topic: mytopic $ hg ci -m "Added a" active topic 'mytopic' grew its first changeset $ hg up -r "desc('ROOT')" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ touch default $ hg add default $ hg commit -m "default" --config experimental.topic-mode=ignore $ hg merge mytopic 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don'tforgettocommit)$hgcommit-m"merge mytopic"warning:newdraftcommitwithouttopic(see'hg help -e topic.topic-mode'fordetails)$hglog-G@changeset:3:676a445d1c09|\ tag:tip||parent:2:a4da109ee59f||parent:1:e5b6c632bd8e||user:test||date:ThuJan0100:00:001970+0000||summary:mergemytopic|||ochangeset:2:a4da109ee59f||parent:0:ec1d2790416d||user:test||date:ThuJan0100:00:001970+0000||summary:default||o|changeset:1:e5b6c632bd8e|/topic:mytopic|user:test|date:ThuJan0100:00:001970+0000|summary:Addeda|ochangeset:0:ec1d2790416duser:testdate:ThuJan0100:00:001970+0000summary:ROOTTestingtheconfigknobtoaboutonuntopicedmergecommit================================================================$hginit$TESTTMP/test-untopic-merge-commit-abort$cd$TESTTMP/test-untopic-merge-commit-abort$cat<<EOF>>.hg/hgrc>[phases]>publish=false>EOF$cat<<EOF>>$HGRCPATH>[experimental]>topic-mode=enforce-all>EOF$touchROOT$hgcommit-A-m"ROOT"--configexperimental.topic-mode=ignoreaddingROOT$toucha$hgadda$hgtopicmytopicmarkedworkingdirectoryastopic:mytopic$hgci-m"Added a"activetopic'mytopic'grewitsfirstchangeset$hgup-r"desc('ROOT')"0filesupdated,0filesmerged,1filesremoved,0filesunresolved$touchdefault$hgadddefault$hgcommit-m"default"--configexperimental.topic-mode=ignore$hgmergemytopic1filesupdated,0filesmerged,0filesremoved,0filesunresolved(branchmerge,don't forget to commit) $ hg commit -m "merge mytopic" abort: no active topic (see 'hghelp-etopic.topic-mode' for details) [255] $ hg log -G @ changeset: 2:a4da109ee59f | tag: tip | parent: 0:ec1d2790416d | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: default | | @ changeset: 1:e5b6c632bd8e |/ topic: mytopic | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: Added a | o changeset: 0:ec1d2790416d user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: ROOTTesting the config knob to use a random topic for untopic commit==================================================================== $ hg init $TESTTMP/test-untopic-random $ cd $TESTTMP/test-untopic-random $ cat <<EOF>> .hg/hgrc > [phases] > publish=false > EOF $ cat <<EOF>> $HGRCPATH > [experimental] > topic-mode = random > EOF $ touch ROOT $ hg commit -A -m "ROOT" --config experimental.topic-mode=ignore adding ROOT $ touch A $ hg add A $ hg commit -m "Add A" --config devel.randomseed=42 active topic 'panoramic-antelope' grew its first changeset $ hg up -r "desc(ROOT)" 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ touch B $ hg add B $ hg commit -m "Add B" --config devel.randomseed=128 active topic 'various-dove' grew its first changesetTest a merge too $ hg phase --public -r . active topic 'various-dove' is now empty $ hg up default clearing empty topic "various-dove" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log -G @ changeset: 2:2d2acb6efad5 | tag: tip | parent: 0:ec1d2790416d | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: Add B | | o changeset: 1:d4b548f35972 |/ topic: panoramic-antelope | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: Add A | o changeset: 0:ec1d2790416d user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: ROOT $ hg merge panoramic-antelope 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don'tforgettocommit)$hgci-m'merge'Testingtheconfigknobtousearandomtopicforuntopiccommit(evenformerge)=================================================================================$hginit$TESTTMP/test-untopic-random-all$cd$TESTTMP/test-untopic-random-all$cat<<EOF>>.hg/hgrc>[phases]>publish=false>EOF$cat<<EOF>>$HGRCPATH>[experimental]>topic-mode=random-all>EOF$touchROOT$hgcommit-A-m"ROOT"--configexperimental.topic-mode=ignoreaddingROOT$touchA$hgaddA$hgcommit-m"Add A"--configdevel.randomseed=42activetopic'panoramic-antelope'grewitsfirstchangeset$hgup-r"desc(ROOT)"0filesupdated,0filesmerged,1filesremoved,0filesunresolved$touchB$hgaddB$hgcommit-m"Add B"--configdevel.randomseed=128activetopic'various-dove'grewitsfirstchangesetTestamergetoo$hgphase--public-r.activetopic'various-dove'isnowempty$hgupdefaultclearingemptytopic"various-dove"0filesupdated,0filesmerged,0filesremoved,0filesunresolved$hglog-G@changeset:2:2d2acb6efad5|tag:tip|parent:0:ec1d2790416d|user:test|date:ThuJan0100:00:001970+0000|summary:AddB||ochangeset:1:d4b548f35972|/topic:panoramic-antelope|user:test|date:ThuJan0100:00:001970+0000|summary:AddA|ochangeset:0:ec1d2790416duser:testdate:ThuJan0100:00:001970+0000summary:ROOT$hgmergepanoramic-antelope1filesupdated,0filesmerged,0filesremoved,0filesunresolved(branchmerge,don't forget to commit) $ hg ci -m 'merge' --config devel.randomseed=1337 active topic 'omniscient-locust' grew its first changeset