equal
deleted
inserted
replaced
17 ) |
17 ) |
18 from . import ( |
18 from . import ( |
19 encoding, |
19 encoding, |
20 error, |
20 error, |
21 lock as lockmod, |
21 lock as lockmod, |
22 obsolete, |
22 obsutil, |
23 pycompat, |
23 pycompat, |
24 scmutil, |
24 scmutil, |
25 txnutil, |
25 txnutil, |
26 util, |
26 util, |
27 ) |
27 ) |
680 elif not old: |
680 elif not old: |
681 # old is nullrev, anything is valid. |
681 # old is nullrev, anything is valid. |
682 # (new != nullrev has been excluded by the previous check) |
682 # (new != nullrev has been excluded by the previous check) |
683 return True |
683 return True |
684 elif repo.obsstore: |
684 elif repo.obsstore: |
685 return new.node() in obsolete.foreground(repo, [old.node()]) |
685 return new.node() in obsutil.foreground(repo, [old.node()]) |
686 else: |
686 else: |
687 # still an independent clause as it is lazier (and therefore faster) |
687 # still an independent clause as it is lazier (and therefore faster) |
688 return old.descendant(new) |
688 return old.descendant(new) |
689 |
689 |
690 def checkformat(repo, mark): |
690 def checkformat(repo, mark): |