mercurial/pure/parsers.py
changeset 47929 03f57915e0ce
parent 47928 f1033c2d9b66
child 47930 7c37d153c22d
equal deleted inserted replaced
47928:f1033c2d9b66 47929:03f57915e0ce
   266         return self._wc_tracked
   266         return self._wc_tracked
   267 
   267 
   268     @property
   268     @property
   269     def added(self):
   269     def added(self):
   270         """True if the file has been added"""
   270         """True if the file has been added"""
   271         return self.v1_state() == b'a'
   271         return self._wc_tracked and not (self._p1_tracked or self._p2_tracked)
   272 
   272 
   273     @property
   273     @property
   274     def merged(self):
   274     def merged(self):
   275         """True if the file has been merged
   275         """True if the file has been merged
   276 
   276