##// END OF EJS Templates
log: evaluate filesets on working copy, not its parent...
Martin von Zweigbergk -
r23950:caff3675 stable
parent child Browse files
Show More
@@ -1048,7 +1048,8 b' def _matchfiles(repo, subset, x):'
1048 # i18n: "_matchfiles" is a keyword
1048 # i18n: "_matchfiles" is a keyword
1049 raise error.ParseError(_('_matchfiles expected at most one '
1049 raise error.ParseError(_('_matchfiles expected at most one '
1050 'revision'))
1050 'revision'))
1051 rev = value
1051 if value != '': # empty means working directory; leave rev as None
1052 rev = value
1052 elif prefix == 'd:':
1053 elif prefix == 'd:':
1053 if default is not None:
1054 if default is not None:
1054 # i18n: "_matchfiles" is a keyword
1055 # i18n: "_matchfiles" is a keyword
@@ -72,14 +72,17 b' Test log'
72 content1_content2_content3-tracked | 1 +
72 content1_content2_content3-tracked | 1 +
73 3 files changed, 3 insertions(+), 0 deletions(-)
73 3 files changed, 3 insertions(+), 0 deletions(-)
74
74
75 BROKEN: rev 0 affects content1_missing_content*-tracked
76
77 $ hg log -T '{rev}\n' --stat 'set:added()'
75 $ hg log -T '{rev}\n' --stat 'set:added()'
78 1
76 1
79 content1_missing_content1-tracked | 1 -
77 content1_missing_content1-tracked | 1 -
80 content1_missing_content3-tracked | 1 -
78 content1_missing_content3-tracked | 1 -
81 2 files changed, 0 insertions(+), 2 deletions(-)
79 2 files changed, 0 insertions(+), 2 deletions(-)
82
80
81 0
82 content1_missing_content1-tracked | 1 +
83 content1_missing_content3-tracked | 1 +
84 2 files changed, 2 insertions(+), 0 deletions(-)
85
83 $ hg log -T '{rev}\n' --stat 'set:removed()'
86 $ hg log -T '{rev}\n' --stat 'set:removed()'
84 1
87 1
85 content1_content2_content1-untracked | 2 +-
88 content1_content2_content1-untracked | 2 +-
@@ -100,22 +103,37 b' BROKEN: rev 0 affects content1_missing_c'
100 content1_content2_content3-untracked | 1 +
103 content1_content2_content3-untracked | 1 +
101 content1_content2_missing-untracked | 1 +
104 content1_content2_missing-untracked | 1 +
102 7 files changed, 7 insertions(+), 0 deletions(-)
105 7 files changed, 7 insertions(+), 0 deletions(-)
103
106
104 BROKEN: rev 0 affects content1_content1_missing-tracked,
105 content1_content2_missing-tracked and content1_missing_missing-tracked.
106 rev 1 affects content1_content2_missing-tracked,
107 content1_missing_missing-tracked and missing_content2_missing-tracked
108
109 $ hg log -T '{rev}\n' --stat 'set:deleted()'
107 $ hg log -T '{rev}\n' --stat 'set:deleted()'
110
108 1
111 BROKEN: rev 0 and 1 affect content1_missing_content*-untracked
109 content1_content2_missing-tracked | 2 +-
112
110 content1_missing_missing-tracked | 1 -
111 missing_content2_missing-tracked | 1 +
112 3 files changed, 2 insertions(+), 2 deletions(-)
113
114 0
115 content1_content1_missing-tracked | 1 +
116 content1_content2_missing-tracked | 1 +
117 content1_missing_missing-tracked | 1 +
118 3 files changed, 3 insertions(+), 0 deletions(-)
119
113 $ hg log -T '{rev}\n' --stat 'set:unknown()'
120 $ hg log -T '{rev}\n' --stat 'set:unknown()'
114
121 1
115 BROKEN: rev 1 affects content1_content2_content2-tracked and
122 content1_missing_content1-untracked | 1 -
116 missing_content2_content2-tracked
123 content1_missing_content3-untracked | 1 -
117
124 2 files changed, 0 insertions(+), 2 deletions(-)
125
126 0
127 content1_missing_content1-untracked | 1 +
128 content1_missing_content3-untracked | 1 +
129 2 files changed, 2 insertions(+), 0 deletions(-)
130
118 $ hg log -T '{rev}\n' --stat 'set:clean()'
131 $ hg log -T '{rev}\n' --stat 'set:clean()'
132 1
133 content1_content2_content2-tracked | 2 +-
134 missing_content2_content2-tracked | 1 +
135 2 files changed, 2 insertions(+), 1 deletions(-)
136
119 0
137 0
120 content1_content1_content1-tracked | 1 +
138 content1_content1_content1-tracked | 1 +
121 content1_content2_content2-tracked | 1 +
139 content1_content2_content2-tracked | 1 +
General Comments 0
You need to be logged in to leave comments. Login now