upstream/mercurial-mirror Commit - r23228:5f5876a2

1

Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get

1

Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get

2

combined correctly with the dirstate status.

2

combined correctly with the dirstate status.

3

4

$ hg init

4

$ hg init

5

$ touch .hgignore

5

$ touch .hgignore

6

$ hg add .hgignore

6

$ hg add .hgignore

7

$ hg commit -m initial

7

$ hg commit -m initial

8

9

First commit

9

First commit

10

11

$ python $TESTDIR/generate-working-copy-states.py base

11

$ python $TESTDIR/generate-working-copy-states.py base

12

$ hg addremove --similarity 0

12

$ hg addremove --similarity 0

13

adding content1_content1_content1-tracked

13

adding content1_content1_content1-tracked

14

adding content1_content1_content1-untracked

14

adding content1_content1_content1-untracked

15

adding content1_content1_content3-tracked

15

adding content1_content1_content3-tracked

16

adding content1_content1_content3-untracked

16

adding content1_content1_content3-untracked

17

adding content1_content1_missing-tracked

17

adding content1_content1_missing-tracked

18

adding content1_content1_missing-untracked

18

adding content1_content1_missing-untracked

19

adding content1_content2_content1-tracked

19

adding content1_content2_content1-tracked

20

adding content1_content2_content1-untracked

20

adding content1_content2_content1-untracked

21

adding content1_content2_content2-tracked

21

adding content1_content2_content2-tracked

22

adding content1_content2_content2-untracked

22

adding content1_content2_content2-untracked

23

adding content1_content2_content3-tracked

23

adding content1_content2_content3-tracked

24

adding content1_content2_content3-untracked

24

adding content1_content2_content3-untracked

25

adding content1_content2_missing-tracked

25

adding content1_content2_missing-tracked

26

adding content1_content2_missing-untracked

26

adding content1_content2_missing-untracked

27

adding content1_missing_content1-tracked

27

adding content1_missing_content1-tracked

28

adding content1_missing_content1-untracked

28

adding content1_missing_content1-untracked

29

adding content1_missing_content3-tracked

29

adding content1_missing_content3-tracked

30

adding content1_missing_content3-untracked

30

adding content1_missing_content3-untracked

31

adding content1_missing_missing-tracked

31

adding content1_missing_missing-tracked

32

adding content1_missing_missing-untracked

32

adding content1_missing_missing-untracked

33

$ hg commit -m first

33

$ hg commit -m first

34

35

Second commit

35

Second commit

36

37

$ python $TESTDIR/generate-working-copy-states.py parent

37

$ python $TESTDIR/generate-working-copy-states.py parent

38

$ hg addremove --similarity 0

38

$ hg addremove --similarity 0

39

removing content1_missing_content1-tracked

39

removing content1_missing_content1-tracked

40

removing content1_missing_content1-untracked

40

removing content1_missing_content1-untracked

41

removing content1_missing_content3-tracked

41

removing content1_missing_content3-tracked

42

removing content1_missing_content3-untracked

42

removing content1_missing_content3-untracked

43

removing content1_missing_missing-tracked

43

removing content1_missing_missing-tracked

44

removing content1_missing_missing-untracked

44

removing content1_missing_missing-untracked

45

adding missing_content2_content2-tracked

45

adding missing_content2_content2-tracked

46

adding missing_content2_content2-untracked

46

adding missing_content2_content2-untracked

47

adding missing_content2_content3-tracked

47

adding missing_content2_content3-tracked

48

adding missing_content2_content3-untracked

48

adding missing_content2_content3-untracked

49

adding missing_content2_missing-tracked

49

adding missing_content2_missing-tracked

50

adding missing_content2_missing-untracked

50

adding missing_content2_missing-untracked

51

$ hg commit -m second

51

$ hg commit -m second

52

53

Working copy

53

Working copy

54

55

$ python $TESTDIR/generate-working-copy-states.py wc

55

$ python $TESTDIR/generate-working-copy-states.py wc

56

$ hg addremove --similarity 0

56

$ hg addremove --similarity 0

57

adding content1_missing_content1-tracked

57

adding content1_missing_content1-tracked

58

adding content1_missing_content1-untracked

58

adding content1_missing_content1-untracked

59

adding content1_missing_content3-tracked

59

adding content1_missing_content3-tracked

60

adding content1_missing_content3-untracked

60

adding content1_missing_content3-untracked

61

adding content1_missing_missing-tracked

61

adding content1_missing_missing-tracked

62

adding content1_missing_missing-untracked

62

adding content1_missing_missing-untracked

63

adding missing_missing_content3-tracked

63

adding missing_missing_content3-tracked

64

adding missing_missing_content3-untracked

64

adding missing_missing_content3-untracked

65

adding missing_missing_missing-tracked

65

adding missing_missing_missing-tracked

66

adding missing_missing_missing-untracked

66

adding missing_missing_missing-untracked

67

$ hg forget *_*_*-untracked

67

$ hg forget *_*_*-untracked

68

$ rm *_*_missing-*

68

$ rm *_*_missing-*

69

70

Status compared to one revision back

70

Status compared to one revision back

71

72

$ hg status -A --rev 1 content1_~~content1_content1~~-tracked

72

$ hg status -A --rev 1 'glob:content1_*_content[23]-tracked'

73

C content1_content1_content1-tracked

74

BROKEN: file appears twice; should be '!'

75

$ hg status -A --rev 1 content1_content1_missing-tracked

76

! content1_content1_missing-tracked

77

C content1_content1_missing-tracked

78

$ hg status -A --rev 1 content1_content1_content1-untracked

79

R content1_content1_content1-untracked

80

$ hg status -A --rev 1 content1_content1_content3-tracked

81

M content1_content1_content3-tracked

73

M content1_content1_content3-tracked

82

$ hg status -A --rev 1 content1_content1_missing-untracked

74

M content1_content2_content2-tracked

75

M content1_content2_content3-tracked

76

M content1_missing_content3-tracked

77

$ hg status -A --rev 1 'glob:content1_*_content1-tracked'

78

C content1_content1_content1-tracked

79

C content1_content2_content1-tracked

80

C content1_missing_content1-tracked

81

$ hg status -A --rev 1 'glob:missing_*_content?-tracked'

82

A missing_content2_content2-tracked

83

A missing_content2_content3-tracked

84

A missing_missing_content3-tracked

85

BROKEN: missing_content2_content[23]-untracked exist, so should be listed

86

$ hg status -A --rev 1 'glob:missing_*_content?-untracked'

87

? missing_missing_content3-untracked

88

$ hg status -A --rev 1 'glob:content1_*_*-untracked'

89

R content1_content1_content1-untracked

90

R content1_content1_content3-untracked

83

R content1_content1_missing-untracked

91

R content1_content1_missing-untracked

84

$ hg ~~status~~ -A --~~rev~~ 1 ~~content1_content2_content2~~-tracked

92

R content1_content2_content1-untracked

85

M content1_content2_content2-tracked

86

BROKEN: file appears twice; should be '!'

87

$ hg status -A --rev 1 content1_content2_missing-tracked

88

! content1_content2_missing-tracked

89

C content1_content2_missing-tracked

90

$ hg status -A --rev 1 content1_content2_content2-untracked

91

R content1_content2_content2-untracked

93

R content1_content2_content2-untracked

92

$ hg ~~status~~ -A --~~rev~~ 1 content1_content2_content3-tracked

94

R content1_content2_content3-untracked

93

M content1_content2_content3-tracked

94

$ hg status -A --rev 1 content1_content2_missing-untracked

95

R content1_content2_missing-untracked

95

R content1_content2_missing-untracked

96

$ hg ~~status~~ -A --~~rev~~ 1 ~~content1_missing_content3~~-tracked

96

R content1_missing_content1-untracked

97

M content1_missing_content3-tracked

97

R content1_missing_content3-untracked

98

BROKEN: file appears twice; should be '!'

98

R content1_missing_missing-untracked

99

$ hg status -A --rev 1 content1_missing_missing-tracked

99

BROKEN: content1_*_missing-tracked appear twice; should just be '!'

100

$ hg status -A --rev 1 'glob:*_*_missing-tracked'

100

R content1_missing_missing-tracked

101

R content1_missing_missing-tracked

102

! content1_content1_missing-tracked

103

! content1_content2_missing-tracked

101

! content1_missing_missing-tracked

104

! content1_missing_missing-tracked

102

$ hg status -A --rev 1 content1_missing_content3-untracked

103

R content1_missing_content3-untracked

104

$ hg status -A --rev 1 missing_content2_missing-tracked

105

! missing_content2_missing-tracked

105

! missing_content2_missing-tracked

106

BROKEN: file exists, so should be listed (as '?')

106

! missing_missing_missing-tracked

107

$ hg status -A --rev 1 missing_content2_content2-untracked

107

C content1_content1_missing-tracked

108

$ hg status -A --rev 1 missing_content2_content3-tracked

108

C content1_content2_missing-tracked

109

A missing_content2_content3-tracked

109

$ hg status -A --rev 1 'glob:missing_*_missing-untracked'

110

$ hg status -A --rev 1 missing_content2_missing-untracked

111

$ hg status -A --rev 1 missing_missing_content3-untracked

112

? missing_missing_content3-untracked

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get
             combined correctly with the dirstate status.
               $ hg init
               $ touch .hgignore
               $ hg add .hgignore
               $ hg commit -m initial
             First commit
               $ python $TESTDIR/generate-working-copy-states.py base
               $ hg addremove --similarity 0
               adding content1_content1_content1-tracked
               adding content1_content1_content1-untracked
               adding content1_content1_content3-tracked
               adding content1_content1_content3-untracked
               adding content1_content1_missing-tracked
               adding content1_content1_missing-untracked
               adding content1_content2_content1-tracked
               adding content1_content2_content1-untracked
               adding content1_content2_content2-tracked
               adding content1_content2_content2-untracked
               adding content1_content2_content3-tracked
               adding content1_content2_content3-untracked
               adding content1_content2_missing-tracked
               adding content1_content2_missing-untracked
               adding content1_missing_content1-tracked
               adding content1_missing_content1-untracked
               adding content1_missing_content3-tracked
               adding content1_missing_content3-untracked
               adding content1_missing_missing-tracked
               adding content1_missing_missing-untracked
               $ hg commit -m first
             Second commit
               $ python $TESTDIR/generate-working-copy-states.py parent
               $ hg addremove --similarity 0
               removing content1_missing_content1-tracked
               removing content1_missing_content1-untracked
               removing content1_missing_content3-tracked
               removing content1_missing_content3-untracked
               removing content1_missing_missing-tracked
               removing content1_missing_missing-untracked
               adding missing_content2_content2-tracked
               adding missing_content2_content2-untracked
               adding missing_content2_content3-tracked
               adding missing_content2_content3-untracked
               adding missing_content2_missing-tracked
               adding missing_content2_missing-untracked
               $ hg commit -m second
             Working copy
               $ python $TESTDIR/generate-working-copy-states.py wc
               $ hg addremove --similarity 0
               adding content1_missing_content1-tracked
               adding content1_missing_content1-untracked
               adding content1_missing_content3-tracked
               adding content1_missing_content3-untracked
               adding content1_missing_missing-tracked
               adding content1_missing_missing-untracked
               adding missing_missing_content3-tracked
               adding missing_missing_content3-untracked
               adding missing_missing_missing-tracked
               adding missing_missing_missing-untracked
               $ hg forget *_*_*-untracked
               $ rm *_*_missing-*
             Status compared to one revision back
-              $ hg status -A --rev 1 content1_content1_content1-tracked
+              $ hg status -A --rev 1 'glob:content1_*_content[23]-tracked'
-              C content1_content1_content1-tracked
-            BROKEN: file appears twice; should be '!'
-              $ hg status -A --rev 1 content1_content1_missing-tracked
-              ! content1_content1_missing-tracked
-              C content1_content1_missing-tracked
-              $ hg status -A --rev 1 content1_content1_content1-untracked
-              R content1_content1_content1-untracked
-              $ hg status -A --rev 1 content1_content1_content3-tracked
               M content1_content1_content3-tracked
-              $ hg status -A --rev 1 content1_content1_missing-untracked
+              M content1_content2_content2-tracked
+              M content1_content2_content3-tracked
+              M content1_missing_content3-tracked
+              $ hg status -A --rev 1 'glob:content1_*_content1-tracked'
+              C content1_content1_content1-tracked
+              C content1_content2_content1-tracked
+              C content1_missing_content1-tracked
+              $ hg status -A --rev 1 'glob:missing_*_content?-tracked'
+              A missing_content2_content2-tracked
+              A missing_content2_content3-tracked
+              A missing_missing_content3-tracked
+            BROKEN: missing_content2_content[23]-untracked exist, so should be listed
+              $ hg status -A --rev 1 'glob:missing_*_content?-untracked'
+              ? missing_missing_content3-untracked
+              $ hg status -A --rev 1 'glob:content1_*_*-untracked'
+              R content1_content1_content1-untracked
+              R content1_content1_content3-untracked
               R content1_content1_missing-untracked
-              $ hg status -A --rev 1 content1_content2_content2-tracked
+              R content1_content2_content1-untracked
-              M content1_content2_content2-tracked
-            BROKEN: file appears twice; should be '!'
-              $ hg status -A --rev 1 content1_content2_missing-tracked
-              ! content1_content2_missing-tracked
-              C content1_content2_missing-tracked
-              $ hg status -A --rev 1 content1_content2_content2-untracked
               R content1_content2_content2-untracked
-              $ hg status -A --rev 1 content1_content2_content3-tracked
+              R content1_content2_content3-untracked
-              M content1_content2_content3-tracked
-              $ hg status -A --rev 1 content1_content2_missing-untracked
               R content1_content2_missing-untracked
-              $ hg status -A --rev 1 content1_missing_content3-tracked
+              R content1_missing_content1-untracked
-              M content1_missing_content3-tracked
+              R content1_missing_content3-untracked
-            BROKEN: file appears twice; should be '!'
+              R content1_missing_missing-untracked
-              $ hg status -A --rev 1 content1_missing_missing-tracked
+            BROKEN: content1_*_missing-tracked appear twice; should just be '!'
+              $ hg status -A --rev 1 'glob:*_*_missing-tracked'
               R content1_missing_missing-tracked
+              ! content1_content1_missing-tracked
+              ! content1_content2_missing-tracked
               ! content1_missing_missing-tracked
-              $ hg status -A --rev 1 content1_missing_content3-untracked
-              R content1_missing_content3-untracked
-              $ hg status -A --rev 1 missing_content2_missing-tracked
               ! missing_content2_missing-tracked
-            BROKEN: file exists, so should be listed (as '?')
+              ! missing_missing_missing-tracked
-              $ hg status -A --rev 1 missing_content2_content2-untracked
+              C content1_content1_missing-tracked
-              $ hg status -A --rev 1 missing_content2_content3-tracked
+              C content1_content2_missing-tracked
-              A missing_content2_content3-tracked
+              $ hg status -A --rev 1 'glob:missing_*_missing-untracked'
-              $ hg status -A --rev 1 missing_content2_missing-untracked
-              $ hg status -A --rev 1 missing_missing_content3-untracked
-              ? missing_missing_content3-untracked