Mercurial > evolve
view tests/test-topic-rebase.t @ 6574:054a7c342463
topic: use distinct names for distinct origvalidator and _validate()
Here, the same topicrepo.transaction method, we set up various transaction
validators. On older hg versions (5.3 and older) this involves storing the
original transaction validator (i.e. tr._validator function) and creating a
wrapper function to use as the replacement.
In cases when multiple
topic-related validators were needed, the code used to store tr._validator
multiple times, and create a wrapper function that used origvalidator multiple
times as well. In such cases we can no longer use the same names for the
functions/variables, as they are used inside multiple validator functions, but
are going to be overridden by later assignments/definitions (due to the shared
names), since it's done in the scope of the same topicrepo.transaction().
Names can be better, but it'll do for now, and at some point we'll simply drop
compatibility for 5.3, which should happen relatively soon.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 14 Oct 2023 15:53:40 -0300 |
parents | a1dad44fe3da |
children | fd039a7f0c3c 9da0114a8a02 |
line wrap: on
line source
test of the rebase command -------------------------- $ cat >> $HGRCPATH <<EOF > [ui] > interactive = true > [extensions] > rebase= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH $ mkcommit() { > echo "$1" > "$1" > hg add "$1" > hg ci -m "add $1" $2 $3 > } $ logtopic() { > hg log -G -T "{rev}:{node}\ntopics: {topic}" > } Check that rebase keep the topic in the simple case (1 changeset, no merge conflict) ------------------------------------------------------------------------------------ $ hg init testrebase $ cd testrebase $ mkcommit ROOT Work on myfeature $ hg topic myfeature marked working directory as topic: myfeature $ mkcommit feature1 active topic 'myfeature' grew its first changeset (see 'hg help topics' for more information) $ hg stack ### topic: myfeature ### target: default (branch) s1@ add feature1 (current) s0^ add ROOT (base) $ logtopic @ 1:39e7a938055e87615edf675c24a10997ff05bb06 | topics: myfeature o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 topics: Create another commit on default $ hg update --rev default 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit default $ logtopic @ 2:be7622a7a0f43ba713e152f56441275f8e8711ef | topics: | o 1:39e7a938055e87615edf675c24a10997ff05bb06 |/ topics: myfeature o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 topics: Rebase the commit $ hg update --rev 1 switching to topic myfeature 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase rebasing 1:39e7a938055e myfeature "add feature1" switching to topic myfeature $ hg stack ### topic: myfeature ### target: default (branch) s1@ add feature1 (current) s0^ add default (base) $ logtopic @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 | topics: myfeature o 2:be7622a7a0f43ba713e152f56441275f8e8711ef | topics: o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 topics: $ hg up 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg stack ### topic: myfeature ### target: default (branch) s1@ add feature1 (current) s0^ add default (base) Check that rebase keep the topic in case of merge conflict ---------------------------------------------------------- Create a common base $ hg topic --clear $ echo "A" > file $ hg commit -A -m "default2" file created new head (consider using topic for lightweight branches. See 'hg help topic') Update the common file in a topic $ hg topic myotherfeature marked working directory as topic: myotherfeature $ echo "B" >> file $ hg commit -m "myotherfeature1" active topic 'myotherfeature' grew its first changeset (see 'hg help topics' for more information) Update the common file in default $ hg update --rev default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "A2" > file $ hg commit -m "default3" Rebase the topic $ hg update --rev 5 switching to topic myotherfeature 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [240] Resolve the conflict $ echo A2 > file $ echo B >> file $ hg resolve -m (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" Check the the commit has the right topic $ logtopic @ 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 | topics: myotherfeature o 6:0b124ef641a7a6f4715d962650d3b367e8c800be | topics: o 4:0cd2e1a45ac4e3f9603a05ccfa6d1c70cd759bc5 | topics: o 3:fc6593661cf3256ba165cbccd6019ead17cc3726 | topics: myfeature o 2:be7622a7a0f43ba713e152f56441275f8e8711ef | topics: o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 topics: $ hg stack ### topic: myotherfeature ### target: default (branch) s1@ myotherfeature1 (current) s0^ default3 (base) $ hg update --rev 7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg stack ### topic: myotherfeature ### target: default (branch) s1@ myotherfeature1 (current) s0^ default3 (base) inmemory rebase currently drops the topic. BUG: inmemory rebase currently drops the topic. This is the correct output because of there's a config override. $ echo x > a.txt $ hg ci -Aqm x $ hg rebase -r . -d 3 --config rebase.experimental.inmemory=1 rebasing 8:1323571d782d tip myotherfeature "x" switching to topic myfeature switching to topic myotherfeature $ logtopic @ 9:42f2e003a46e77e1b33da4434c2689722b976b73 | topics: myotherfeature | o 7:6ccb9ec4913b64f3ad719ff1ba66495a70bf35a4 | | topics: myotherfeature | o 6:0b124ef641a7a6f4715d962650d3b367e8c800be | | topics: | o 4:0cd2e1a45ac4e3f9603a05ccfa6d1c70cd759bc5 |/ topics: o 3:fc6593661cf3256ba165cbccd6019ead17cc3726 | topics: myfeature o 2:be7622a7a0f43ba713e152f56441275f8e8711ef | topics: o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 topics: