equal
deleted
inserted
replaced
558 |
558 |
559 note: the API is at an early stage and we might need to ajust it |
559 note: the API is at an early stage and we might need to ajust it |
560 depending of what information ends up being relevant and useful to |
560 depending of what information ends up being relevant and useful to |
561 other processing. |
561 other processing. |
562 """ |
562 """ |
563 if not self.pendingparentchange(): |
|
564 msg = b'calling `update_file` outside of a parentchange context' |
|
565 raise error.ProgrammingError(msg) |
|
566 if merged and (clean_p1 or clean_p2): |
563 if merged and (clean_p1 or clean_p2): |
567 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
564 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
568 raise error.ProgrammingError(msg) |
565 raise error.ProgrammingError(msg) |
569 assert not (merged and (clean_p1 or clean_p1)) |
566 assert not (merged and (clean_p1 or clean_p1)) |
570 if not (p1_tracked or p2_tracked or wc_tracked): |
567 if not (p1_tracked or p2_tracked or wc_tracked): |