Mercurial > evolve
annotate tests/test-topic-shelve.t @ 6935:954d7ea5cd67 stable tip
stack: when stack base is obsolete, pick any successor, even if at random
There are situations when s0 is obsolete and we also cannot pick just one
successor for it to use in stack. In such a case, let's pick the "latest"
successor from the first set.
We're assuming that obsutil.successorssets() returns data in the same order (it
should, since it makes sure to sort data internally). Keeping that in mind,
while the successor picked for s0 by this code is not based on any sort of
sophisticated logic, it should nonetheless be the same every time.
This patch is probably not going to completely break anything that was
previously working fine, because the previous behavior was to just abort with
an exception.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 16 Nov 2024 17:01:02 +0400 |
parents | fb4801478d5d |
children | 9da0114a8a02 |
rev | line source |
---|---|
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 testing topic with shelve extension |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 ------------------------------------ |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 $ . "$TESTDIR/testlib/topic_setup.sh" |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 $ hg init repo |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 $ cd repo |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 $ cat <<EOF >>.hg/hgrc |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 > [extensions] |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 > shelve= |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 > EOF |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 $ touch a |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 $ echo "Hello" >> a |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 $ hg topic "testing-shelve" |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2680
diff
changeset
|
16 marked working directory as topic: testing-shelve |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2997
diff
changeset
|
18 * testing-shelve (0 changesets) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 $ hg ci -m "First commit" -A |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 adding a |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2985
diff
changeset
|
21 active topic 'testing-shelve' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3060
diff
changeset
|
22 (see 'hg help topics' for more information) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2997
diff
changeset
|
24 * testing-shelve (1 changesets) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 $ echo " World" >> a |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 $ hg stack |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 ### topic: testing-shelve |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
28 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3769
diff
changeset
|
29 s1@ First commit (current) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 shelve test |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 ----------- |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 $ hg shelve |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 shelved as default |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2997
diff
changeset
|
38 * testing-shelve (1 changesets) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 $ hg stack |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 ### topic: testing-shelve |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
41 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3769
diff
changeset
|
42 s1@ First commit (current) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 unshelve test |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 ------------- |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 $ hg unshelve |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 unshelving change 'default' |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2997
diff
changeset
|
49 * testing-shelve (1 changesets) |
2680
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 $ hg stack |
d5eb5269128a
tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 ### topic: testing-shelve |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
52 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3769
diff
changeset
|
53 s1@ First commit (current) |