Home
last modified time | relevance | path

Searched refs:mergemod (Results 1 – 10 of 10) sorted by relevance

/dports/devel/py-hg-evolve/hg-evolve-10.4.1/hgext3rd/evolve/
H A Dcompat.py20 merge as mergemod, unknown
41 mergestate = mergemod.mergestate # pytype: disable=module-attr
366 if util.safehasattr(mergemod, '_update'):
368 return mergemod._update(*args, **kwargs)
372 return mergemod.update(*args, **kwargs)
374 if (util.safehasattr(mergemod, '_update')
375 and util.safehasattr(mergemod, 'update')):
378 mergemod.update(ctx)
381 mergemod.clean_update(ctx)
/dports/devel/mercurial/mercurial-6.0/mercurial/
H A Dhg.py39 merge as mergemod, unknown
1087 return mergemod._update(
1112 stats = mergemod.clean_update(repo[node])
1123 mergemod.UPDATECHECK_ABORT,
1124 mergemod.UPDATECHECK_NONE,
1125 mergemod.UPDATECHECK_LINEAR,
1126 mergemod.UPDATECHECK_NO_CONFLICT,
1160 updatecheck = mergemod.UPDATECHECK_LINEAR
1177 if updatecheck == mergemod.UPDATECHECK_ABORT:
1179 updatecheck = mergemod.UPDATECHECK_NONE
[all …]
H A Dsparse.py17 merge as mergemod, unknown
271 mresult = mergemod.mergeresult()
280 mergemod.applyupdates(
429 tmresult = mergemod.mergeresult()
443 mergemod.applyupdates(
516 mresult = mergemod.mergeresult()
562 mergemod.applyupdates(
H A Dcmdutil.py39 merge as mergemod, unknown
603 mergemod.revert_to(repo[b'.'], matcher=m)
1507 mergemod.graft(repo, ctx, wctx=new_ctx)
1616 mergemod.graft(repo, ctx, wctx=new_ctx)
3932 mergemod.clean_update(startctx)
3942 mergemod.clean_update(startctx)
H A Dcommands.py47 merge as mergemod, unknown
830 stats = mergemod.back_out(ctx, parent=repo[parent])
3312 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3354 mergemod.clean_update(pctx)
5592 paths = mergemod.purge(
/dports/devel/mercurial/mercurial-6.0/hgext/
H A Dsparse.py85 merge as mergemod, unknown
188 extensions.wrapfunction(mergemod, b'update', clonesparse)
H A Drebase.py39 merge as mergemod, unknown
665 mergemod.update(repo[p1], wc=self.wctx)
771 mergemod.update(repo[newwd])
857 mergemod.clean_update(repo[self.originalwd])
1113 mergemod.clean_update(repo[rbsrt.originalwd])
1526 mergemod.clean_update(p1ctx)
1540 stats = mergemod._update(
H A Dhistedit.py230 merge as mergemod, unknown
663 stats = mergemod.updateresult(0, 0, 0, 0)
670 stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])
908 mergemod.update(ctx.p1())
952 mergemod.update(repo[n])
970 mergemod.clean_update(self.repo[self.node])
2089 mergemod.update(repo[state.parentctxnode])
2260 mergemod.calculateupdates(
/dports/devel/mercurial/mercurial-6.0/hgext/convert/
H A Dhg.py40 merge as mergemod, unknown
225 mresult = mergemod.calculateupdates(
/dports/devel/tortoisehg/tortoisehg-5.9.3/tortoisehg/hgqt/
H A Drun.py1094 from tortoisehg.hgqt import merge as mergemod unknown
1102 return mergemod.MergeDialog(repoagent, rev)