equal
deleted
inserted
replaced
19 from .i18n import _ |
19 from .i18n import _ |
20 from .node import ( |
20 from .node import ( |
21 bin, |
21 bin, |
22 hex, |
22 hex, |
23 nullid, |
23 nullid, |
|
24 nullrev, |
24 short, |
25 short, |
25 wdirid, |
26 wdirid, |
26 wdirrev, |
27 wdirrev, |
27 ) |
28 ) |
28 |
29 |
728 """ |
729 """ |
729 parents = ctx.parents() |
730 parents = ctx.parents() |
730 if len(parents) > 1: |
731 if len(parents) > 1: |
731 return parents |
732 return parents |
732 if repo.ui.debugflag: |
733 if repo.ui.debugflag: |
733 return [parents[0], repo['null']] |
734 return [parents[0], repo[nullrev]] |
734 if parents[0].rev() >= intrev(ctx) - 1: |
735 if parents[0].rev() >= intrev(ctx) - 1: |
735 return [] |
736 return [] |
736 return parents |
737 return parents |
737 |
738 |
738 def expandpats(pats): |
739 def expandpats(pats): |