Mercurial > hg
annotate tests/test-empty.t @ 45382:0652a533fe3c
mergestate: use _stateextras instead of merge records for commit related info
There is a set of information related to a merge which is needed on commit. We
want to store such information in the mergestate so that we can read it while
committing.
For this purpose, we are using merge records and introduced a merge
entry state for that. However this won't scale and is not clean way to implement
this.
This patch reworks the existing logic related to this to use _stateextras and
read from it.
Right now the information stored is not very descriptive but it will be in next
patch.
Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be
kept for BC.
Differential Revision: https://phab.mercurial-scm.org/D8920
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 10 Aug 2020 15:29:02 +0530 |
parents | d5622dfe4ba3 |
children | 95a615dd77bf |
rev | line source |
---|---|
11743 | 1 Create an empty repo: |
2 | |
3 $ hg init a | |
4 $ cd a | |
5 | |
6 Try some commands: | |
7 | |
8 $ hg log | |
9 $ hg grep wah | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11743
diff
changeset
|
10 [1] |
11743 | 11 $ hg manifest |
12 $ hg verify | |
13 checking changesets | |
14 checking manifests | |
15 crosschecking files in changesets and manifests | |
16 checking files | |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
19929
diff
changeset
|
17 checked 0 changesets with 0 changes to 0 files |
11743 | 18 |
19 Check the basic files created: | |
20 | |
21 $ ls .hg | |
22 00changelog.i | |
40793
64cdfcc73706
cache: create `cache` directory at init time
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
23 cache |
11743 | 24 requires |
25 store | |
40794
d5622dfe4ba3
cache: create `wcache` directory at init time
Boris Feld <boris.feld@octobus.net>
parents:
40793
diff
changeset
|
26 wcache |
11743 | 27 |
28 Should be empty: | |
1338 | 29 |
11743 | 30 $ ls .hg/store |
31 | |
32 Poke at a clone: | |
6944
7e5f3480c45b
fix regression on empty repo cloning introduced by 0642d9d7ec80
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1338
diff
changeset
|
33 |
11743 | 34 $ cd .. |
35 $ hg clone a b | |
36 updating to branch default | |
37 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
38 $ cd b | |
39 $ hg verify | |
40 checking changesets | |
41 checking manifests | |
42 crosschecking files in changesets and manifests | |
43 checking files | |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
19929
diff
changeset
|
44 checked 0 changesets with 0 changes to 0 files |
11743 | 45 $ ls .hg |
46 00changelog.i | |
47 hgrc | |
48 requires | |
49 store | |
50 | |
51 Should be empty: | |
52 | |
53 $ ls .hg/store | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12316
diff
changeset
|
54 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12316
diff
changeset
|
55 $ cd .. |