Mercurial > hg
view mercurial/hg.py @ 1647:64a1169c927d
Use of opendiff as merge program on MacOS X
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sun, 29 Jan 2006 10:10:00 +1300 |
parents | c81d264cd17d |
children | dec6d3c13dbf |
line wrap: on
line source
# hg.py - repository classes for mercurial # # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. from node import * from repo import * from demandload import * demandload(globals(), "localrepo httprepo sshrepo statichttprepo") def repository(ui, path=None, create=0): if path: if path.startswith("http://"): return httprepo.httprepository(ui, path) if path.startswith("https://"): return httprepo.httpsrepository(ui, path) if path.startswith("hg://"): return httprepo.httprepository( ui, path.replace("hg://", "http://")) if path.startswith("old-http://"): return statichttprepo.statichttprepository( ui, path.replace("old-http://", "http://")) if path.startswith("ssh://"): return sshrepo.sshrepository(ui, path) return localrepo.localrepository(ui, path, create)