equal
deleted
inserted
replaced
78 |
78 |
79 cmdtable = {} |
79 cmdtable = {} |
80 command = cmdutil.command(cmdtable) |
80 command = cmdutil.command(cmdtable) |
81 testedwith = 'internal' |
81 testedwith = 'internal' |
82 |
82 |
83 # force load strip extension formely included in mq and import some utility |
83 # force load strip extension formerly included in mq and import some utility |
84 try: |
84 try: |
85 stripext = extensions.find('strip') |
85 stripext = extensions.find('strip') |
86 except KeyError: |
86 except KeyError: |
87 # note: load is lazy so we could avoid the try-except, |
87 # note: load is lazy so we could avoid the try-except, |
88 # but I (marmoute) prefer this explicite code. |
88 # but I (marmoute) prefer this explicit code. |
89 class dummyui(object): |
89 class dummyui(object): |
90 def debug(self, msg): |
90 def debug(self, msg): |
91 pass |
91 pass |
92 stripext = extensions.load(dummyui(), 'strip', '') |
92 stripext = extensions.load(dummyui(), 'strip', '') |
93 |
93 |
649 |
649 |
650 def qparents(self, repo, rev=None): |
650 def qparents(self, repo, rev=None): |
651 """return the mq handled parent or p1 |
651 """return the mq handled parent or p1 |
652 |
652 |
653 In some case where mq get himself in being the parent of a merge the |
653 In some case where mq get himself in being the parent of a merge the |
654 paappropriate parent may be p2. |
654 appropriate parent may be p2. |
655 (eg: an in progress merge started with mq disabled) |
655 (eg: an in progress merge started with mq disabled) |
656 |
656 |
657 If no parent are managed by mq, p1 is returned. |
657 If no parent are managed by mq, p1 is returned. |
658 """ |
658 """ |
659 if rev is None: |
659 if rev is None: |