rust/hg-core/src/dirstate/entry.rs
changeset 48153 c29d312657d2
parent 48152 8f88307f8e07
child 48154 7a8c9869e4fe
equal deleted inserted replaced
48152:8f88307f8e07 48153:c29d312657d2
   167 
   167 
   168     pub fn p2_info(&self) -> bool {
   168     pub fn p2_info(&self) -> bool {
   169         self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
   169         self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
   170     }
   170     }
   171 
   171 
   172     pub fn merged(&self) -> bool {
       
   173         self.flags
       
   174             .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
       
   175     }
       
   176 
       
   177     pub fn added(&self) -> bool {
   172     pub fn added(&self) -> bool {
   178         self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
   173         self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
   179     }
   174     }
   180 
   175 
   181     pub fn maybe_clean(&self) -> bool {
   176     pub fn maybe_clean(&self) -> bool {