##// END OF EJS Templates
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file...
Christian Ebert -
r15871:07893690 stable
parent child Browse files
Show More
@@ -680,7 +680,8 b' def reposetup(ui, repo):'
680 # not make sense
680 # not make sense
681 if (fctx._filerev is None and
681 if (fctx._filerev is None and
682 (self._repo._encodefilterpats or
682 (self._repo._encodefilterpats or
683 kwt.match(fctx.path()) and not 'l' in fctx.flags()) or
683 kwt.match(fctx.path()) and not 'l' in fctx.flags() or
684 self.size() - 4 == fctx.size()) or
684 self.size() == fctx.size()):
685 self.size() == fctx.size()):
685 return self._filelog.cmp(self._filenode, fctx.data())
686 return self._filelog.cmp(self._filenode, fctx.data())
686 return True
687 return True
@@ -160,13 +160,31 b' hg cat files and symlink, no expansion'
160 ignore $Id$
160 ignore $Id$
161 a
161 a
162
162
163 Test hook execution
164
165 $ diff a hooktest
163 $ diff a hooktest
166
164
167 $ cp $HGRCPATH.nohooks $HGRCPATH
165 $ cp $HGRCPATH.nohooks $HGRCPATH
168 $ rm hooktest
166 $ rm hooktest
169
167
168 hg status of kw-ignored binary file starting with '\1\n'
169
170 $ printf '\1\nfoo' > i
171 $ hg -q commit -Am metasep i
172 $ hg status
173 $ printf '\1\nbar' > i
174 $ hg status
175 M i
176 $ hg -q commit -m "modify metasep" i
177 $ hg status --rev 2:3
178 M i
179 $ touch empty
180 $ hg -q commit -A -m "another file"
181 $ hg status -A --rev 3:4 i
182 C i
183
184 $ hg -q strip -n 2
185
186 Test hook execution
187
170 bundle
188 bundle
171
189
172 $ hg bundle --base null ../kw.hg
190 $ hg bundle --base null ../kw.hg
General Comments 0
You need to be logged in to leave comments. Login now