Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/hg.py @ 1701:4ba8fe499df2
hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:10 -0600 |
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)