Linux server.edchosting.com 4.18.0-553.79.1.lve.el7h.x86_64 #1 SMP Wed Oct 15 16:34:46 UTC 2025 x86_64
LiteSpeed
Server IP : 75.98.162.185 & Your IP : 216.73.216.163
Domains :
Cant Read [ /etc/named.conf ]
User : goons4good
Terminal
Auto Root
Create File
Create Folder
Localroot Suggester
Backdoor Destroyer
Readme
/
lib64 /
python2.7 /
site-packages /
mercurial /
Delete
Unzip
Name
Size
Permission
Date
Action
help
[ DIR ]
drwxr-xr-x
2021-09-16 10:54
hgweb
[ DIR ]
drwxr-xr-x
2021-09-16 10:54
httpclient
[ DIR ]
drwxr-xr-x
2021-09-16 10:54
templates
[ DIR ]
drwxr-xr-x
2021-09-16 10:54
__init__.py
0
B
-rw-r--r--
2013-06-01 18:10
__init__.pyc
143
B
-rw-r--r--
2020-03-31 23:33
__init__.pyo
143
B
-rw-r--r--
2020-03-31 23:33
__version__.py
59
B
-rw-r--r--
2013-06-01 18:10
__version__.pyc
174
B
-rw-r--r--
2020-03-31 23:33
__version__.pyo
174
B
-rw-r--r--
2020-03-31 23:33
ancestor.py
12.62
KB
-rw-r--r--
2013-06-01 18:10
ancestor.pyc
9.1
KB
-rw-r--r--
2020-03-31 23:33
ancestor.pyo
9.1
KB
-rw-r--r--
2020-03-31 23:33
archival.py
10.15
KB
-rw-r--r--
2013-06-01 18:10
archival.pyc
12.62
KB
-rw-r--r--
2020-03-31 23:33
archival.pyo
12.62
KB
-rw-r--r--
2020-03-31 23:33
base85.so
11.05
KB
-rwxr-xr-x
2020-03-31 23:33
bdiff.so
15.23
KB
-rwxr-xr-x
2020-03-31 23:33
bookmarks.py
9.44
KB
-rw-r--r--
2013-06-01 18:10
bookmarks.pyc
9.4
KB
-rw-r--r--
2020-03-31 23:33
bookmarks.pyo
9.4
KB
-rw-r--r--
2020-03-31 23:33
branchmap.py
8.74
KB
-rw-r--r--
2013-06-01 18:10
branchmap.pyc
7.53
KB
-rw-r--r--
2020-03-31 23:33
branchmap.pyo
7.48
KB
-rw-r--r--
2020-03-31 23:33
bundlerepo.py
13.38
KB
-rw-r--r--
2013-06-01 18:10
bundlerepo.pyc
13.36
KB
-rw-r--r--
2020-03-31 23:33
bundlerepo.pyo
13.36
KB
-rw-r--r--
2020-03-31 23:33
byterange.py
16.14
KB
-rw-r--r--
2013-06-01 18:10
byterange.pyc
14.98
KB
-rw-r--r--
2020-03-31 23:33
byterange.pyo
14.83
KB
-rw-r--r--
2020-03-31 23:33
changegroup.py
8.09
KB
-rw-r--r--
2013-06-01 18:10
changegroup.pyc
11.1
KB
-rw-r--r--
2020-03-31 23:33
changegroup.pyo
11.1
KB
-rw-r--r--
2020-03-31 23:33
changelog.py
11.75
KB
-rw-r--r--
2013-06-01 18:10
changelog.pyc
14.08
KB
-rw-r--r--
2020-03-31 23:33
changelog.pyo
14.04
KB
-rw-r--r--
2020-03-31 23:33
cmdutil.py
75.63
KB
-rw-r--r--
2020-03-31 23:33
cmdutil.pyc
64.09
KB
-rw-r--r--
2020-03-31 23:33
cmdutil.pyo
64.09
KB
-rw-r--r--
2020-03-31 23:33
commands.py
211.62
KB
-rw-r--r--
2013-06-01 18:10
commands.pyc
197.58
KB
-rw-r--r--
2020-03-31 23:33
commands.pyo
197.53
KB
-rw-r--r--
2020-03-31 23:33
commandserver.py
6.56
KB
-rw-r--r--
2013-06-01 18:10
commandserver.pyc
7.48
KB
-rw-r--r--
2020-03-31 23:33
commandserver.pyo
7.44
KB
-rw-r--r--
2020-03-31 23:33
config.py
6.57
KB
-rw-r--r--
2013-06-01 18:10
config.pyc
8.15
KB
-rw-r--r--
2020-03-31 23:33
config.pyo
8.15
KB
-rw-r--r--
2020-03-31 23:33
context.py
44.46
KB
-rw-r--r--
2020-03-31 23:33
context.pyc
59.66
KB
-rw-r--r--
2020-03-31 23:33
context.pyo
59.43
KB
-rw-r--r--
2020-03-31 23:33
copies.py
12.04
KB
-rw-r--r--
2013-06-01 18:10
copies.pyc
9.19
KB
-rw-r--r--
2020-03-31 23:33
copies.pyo
9.19
KB
-rw-r--r--
2020-03-31 23:33
dagparser.py
14.4
KB
-rw-r--r--
2013-06-01 18:10
dagparser.pyc
12.92
KB
-rw-r--r--
2020-03-31 23:33
dagparser.pyo
12.92
KB
-rw-r--r--
2020-03-31 23:33
dagutil.py
8.04
KB
-rw-r--r--
2013-06-01 18:10
dagutil.pyc
11.31
KB
-rw-r--r--
2020-03-31 23:33
dagutil.pyo
11.21
KB
-rw-r--r--
2020-03-31 23:33
demandimport.py
5.13
KB
-rw-r--r--
2013-06-01 18:10
demandimport.pyc
5.17
KB
-rw-r--r--
2020-03-31 23:33
demandimport.pyo
5.17
KB
-rw-r--r--
2020-03-31 23:33
dicthelpers.py
1.58
KB
-rw-r--r--
2013-06-01 18:10
dicthelpers.pyc
1.59
KB
-rw-r--r--
2020-03-31 23:33
dicthelpers.pyo
1.59
KB
-rw-r--r--
2020-03-31 23:33
diffhelpers.so
11.18
KB
-rwxr-xr-x
2020-03-31 23:33
dirstate.py
27.42
KB
-rw-r--r--
2020-03-31 23:33
dirstate.pyc
25.63
KB
-rw-r--r--
2020-03-31 23:33
dirstate.pyo
25.63
KB
-rw-r--r--
2020-03-31 23:33
discovery.py
13.38
KB
-rw-r--r--
2013-06-01 18:10
discovery.pyc
11.35
KB
-rw-r--r--
2020-03-31 23:33
discovery.pyo
11.35
KB
-rw-r--r--
2020-03-31 23:33
dispatch.py
31.68
KB
-rw-r--r--
2020-03-31 23:33
dispatch.pyc
27.9
KB
-rw-r--r--
2020-03-31 23:33
dispatch.pyo
27.9
KB
-rw-r--r--
2020-03-31 23:33
encoding.py
9.36
KB
-rw-r--r--
2013-06-01 18:10
encoding.pyc
9.96
KB
-rw-r--r--
2020-03-31 23:33
encoding.pyo
9.96
KB
-rw-r--r--
2020-03-31 23:33
error.py
2.68
KB
-rw-r--r--
2013-06-01 18:10
error.pyc
6.36
KB
-rw-r--r--
2020-03-31 23:33
error.pyo
6.36
KB
-rw-r--r--
2020-03-31 23:33
extensions.py
10.69
KB
-rw-r--r--
2013-06-01 18:10
extensions.pyc
11.3
KB
-rw-r--r--
2020-03-31 23:33
extensions.pyo
11.15
KB
-rw-r--r--
2020-03-31 23:33
fancyopts.py
3.48
KB
-rw-r--r--
2013-06-01 18:10
fancyopts.pyc
2.95
KB
-rw-r--r--
2020-03-31 23:33
fancyopts.pyo
2.95
KB
-rw-r--r--
2020-03-31 23:33
filelog.py
2.69
KB
-rw-r--r--
2013-06-01 18:10
filelog.pyc
3.59
KB
-rw-r--r--
2020-03-31 23:33
filelog.pyo
3.59
KB
-rw-r--r--
2020-03-31 23:33
filemerge.py
12.55
KB
-rw-r--r--
2013-06-01 18:10
filemerge.pyc
13.13
KB
-rw-r--r--
2020-03-31 23:33
filemerge.pyo
13.13
KB
-rw-r--r--
2020-03-31 23:33
fileset.py
14.92
KB
-rw-r--r--
2013-06-01 18:10
fileset.pyc
20.04
KB
-rw-r--r--
2020-03-31 23:33
fileset.pyo
20.04
KB
-rw-r--r--
2020-03-31 23:33
formatter.py
2.79
KB
-rw-r--r--
2013-06-01 18:10
formatter.pyc
5.5
KB
-rw-r--r--
2020-03-31 23:33
formatter.pyo
5.5
KB
-rw-r--r--
2020-03-31 23:33
graphmod.py
11.79
KB
-rw-r--r--
2013-06-01 18:10
graphmod.pyc
10.08
KB
-rw-r--r--
2020-03-31 23:33
graphmod.pyo
10.02
KB
-rw-r--r--
2020-03-31 23:33
hbisect.py
9.01
KB
-rw-r--r--
2013-06-01 18:10
hbisect.pyc
6.59
KB
-rw-r--r--
2020-03-31 23:33
hbisect.pyo
6.55
KB
-rw-r--r--
2020-03-31 23:33
help.py
17.6
KB
-rw-r--r--
2013-06-01 18:10
help.pyc
16.02
KB
-rw-r--r--
2020-03-31 23:33
help.pyo
16.02
KB
-rw-r--r--
2020-03-31 23:33
hg.py
21.44
KB
-rw-r--r--
2013-06-01 18:10
hg.pyc
20.09
KB
-rw-r--r--
2020-03-31 23:33
hg.pyo
20.09
KB
-rw-r--r--
2020-03-31 23:33
hook.py
7.7
KB
-rw-r--r--
2013-06-01 18:10
hook.pyc
6.56
KB
-rw-r--r--
2020-03-31 23:33
hook.pyo
6.56
KB
-rw-r--r--
2020-03-31 23:33
httpconnection.py
10.66
KB
-rw-r--r--
2013-06-01 18:10
httpconnection.pyc
9.32
KB
-rw-r--r--
2020-03-31 23:33
httpconnection.pyo
9.32
KB
-rw-r--r--
2020-03-31 23:33
httppeer.py
9.08
KB
-rw-r--r--
2013-06-01 18:10
httppeer.pyc
9.36
KB
-rw-r--r--
2020-03-31 23:33
httppeer.pyo
9.36
KB
-rw-r--r--
2020-03-31 23:33
i18n.py
2.1
KB
-rw-r--r--
2020-03-31 23:33
i18n.pyc
1.86
KB
-rw-r--r--
2020-03-31 23:33
i18n.pyo
1.86
KB
-rw-r--r--
2020-03-31 23:33
ignore.py
3.48
KB
-rw-r--r--
2013-06-01 18:10
ignore.pyc
3.25
KB
-rw-r--r--
2020-03-31 23:33
ignore.pyo
3.25
KB
-rw-r--r--
2020-03-31 23:33
keepalive.py
25.31
KB
-rw-r--r--
2013-06-01 18:10
keepalive.pyc
21.97
KB
-rw-r--r--
2020-03-31 23:33
keepalive.pyo
21.97
KB
-rw-r--r--
2020-03-31 23:33
localrepo.py
99.89
KB
-rw-r--r--
2020-03-31 23:33
localrepo.pyc
83.39
KB
-rw-r--r--
2020-03-31 23:33
localrepo.pyo
83.34
KB
-rw-r--r--
2020-03-31 23:33
lock.py
4.81
KB
-rw-r--r--
2013-06-01 18:10
lock.pyc
4.57
KB
-rw-r--r--
2020-03-31 23:33
lock.pyo
4.57
KB
-rw-r--r--
2020-03-31 23:33
lsprof.py
3.59
KB
-rw-r--r--
2013-06-01 18:10
lsprof.pyc
4.47
KB
-rw-r--r--
2020-03-31 23:33
lsprof.pyo
4.47
KB
-rw-r--r--
2020-03-31 23:33
lsprofcalltree.py
2.7
KB
-rw-r--r--
2013-06-01 18:10
lsprofcalltree.pyc
2.99
KB
-rw-r--r--
2020-03-31 23:33
lsprofcalltree.pyo
2.99
KB
-rw-r--r--
2020-03-31 23:33
mail.py
12.21
KB
-rw-r--r--
2013-06-01 18:10
mail.pyc
13.48
KB
-rw-r--r--
2020-03-31 23:33
mail.pyo
13.48
KB
-rw-r--r--
2020-03-31 23:33
manifest.py
7.95
KB
-rw-r--r--
2013-06-01 18:10
manifest.pyc
8.03
KB
-rw-r--r--
2020-03-31 23:33
manifest.pyo
8.03
KB
-rw-r--r--
2020-03-31 23:33
match.py
10.73
KB
-rw-r--r--
2013-06-01 18:10
match.pyc
13.96
KB
-rw-r--r--
2020-03-31 23:33
match.pyo
13.96
KB
-rw-r--r--
2020-03-31 23:33
mdiff.py
11.34
KB
-rw-r--r--
2013-06-01 18:10
mdiff.pyc
11.04
KB
-rw-r--r--
2020-03-31 23:33
mdiff.pyo
11.04
KB
-rw-r--r--
2020-03-31 23:33
merge.py
27.73
KB
-rw-r--r--
2013-06-01 18:10
merge.pyc
23.22
KB
-rw-r--r--
2020-03-31 23:33
merge.pyo
23.12
KB
-rw-r--r--
2020-03-31 23:33
minirst.py
23.93
KB
-rw-r--r--
2013-06-01 18:10
minirst.pyc
20.82
KB
-rw-r--r--
2020-03-31 23:33
minirst.pyo
20.82
KB
-rw-r--r--
2020-03-31 23:33
mpatch.so
11.17
KB
-rwxr-xr-x
2020-03-31 23:33
node.py
449
B
-rw-r--r--
2013-06-01 18:10
node.pyc
483
B
-rw-r--r--
2020-03-31 23:33
node.pyo
483
B
-rw-r--r--
2020-03-31 23:33
obsolete.py
29.41
KB
-rw-r--r--
2013-06-01 18:10
obsolete.pyc
25.01
KB
-rw-r--r--
2020-03-31 23:33
obsolete.pyo
24.97
KB
-rw-r--r--
2020-03-31 23:33
osutil.so
16.07
KB
-rwxr-xr-x
2020-03-31 23:33
parser.py
3.67
KB
-rw-r--r--
2013-06-01 18:10
parser.pyc
3.32
KB
-rw-r--r--
2020-03-31 23:33
parser.pyo
3.32
KB
-rw-r--r--
2020-03-31 23:33
parsers.so
45.55
KB
-rwxr-xr-x
2020-03-31 23:33
patch.py
63.88
KB
-rw-r--r--
2013-06-01 18:10
patch.pyc
59.85
KB
-rw-r--r--
2020-03-31 23:33
patch.pyo
59.85
KB
-rw-r--r--
2020-03-31 23:33
peer.py
1.32
KB
-rw-r--r--
2013-06-01 18:10
peer.pyc
1.96
KB
-rw-r--r--
2020-03-31 23:33
peer.pyo
1.96
KB
-rw-r--r--
2020-03-31 23:33
phases.py
14.37
KB
-rw-r--r--
2013-06-01 18:10
phases.pyc
13.55
KB
-rw-r--r--
2020-03-31 23:33
phases.pyo
13.55
KB
-rw-r--r--
2020-03-31 23:33
posix.py
18.95
KB
-rw-r--r--
2020-03-31 23:33
posix.pyc
21.35
KB
-rw-r--r--
2020-03-31 23:33
posix.pyo
21.35
KB
-rw-r--r--
2020-03-31 23:33
pushkey.py
1.13
KB
-rw-r--r--
2013-06-01 18:10
pushkey.pyc
1.99
KB
-rw-r--r--
2020-03-31 23:33
pushkey.pyo
1.99
KB
-rw-r--r--
2020-03-31 23:33
pvec.py
5.85
KB
-rw-r--r--
2013-06-01 18:10
pvec.pyc
7.36
KB
-rw-r--r--
2020-03-31 23:33
pvec.pyo
7.36
KB
-rw-r--r--
2020-03-31 23:33
py3kcompat.py
2.31
KB
-rw-r--r--
2013-06-01 18:10
py3kcompat.pyc
1.9
KB
-rw-r--r--
2020-03-31 23:33
py3kcompat.pyo
1.9
KB
-rw-r--r--
2020-03-31 23:33
repair.py
6.02
KB
-rw-r--r--
2013-06-01 18:10
repair.pyc
5.12
KB
-rw-r--r--
2020-03-31 23:33
repair.pyo
5.12
KB
-rw-r--r--
2020-03-31 23:33
repoview.py
8.49
KB
-rw-r--r--
2013-06-01 18:10
repoview.pyc
9.2
KB
-rw-r--r--
2020-03-31 23:33
repoview.pyo
9.06
KB
-rw-r--r--
2020-03-31 23:33
revlog.py
44.66
KB
-rw-r--r--
2013-06-01 18:10
revlog.pyc
38.92
KB
-rw-r--r--
2020-03-31 23:33
revlog.pyo
38.86
KB
-rw-r--r--
2020-03-31 23:33
revset.py
61.17
KB
-rw-r--r--
2013-06-01 18:10
revset.pyc
67.28
KB
-rw-r--r--
2020-03-31 23:33
revset.pyo
67.28
KB
-rw-r--r--
2020-03-31 23:33
scmposix.py
877
B
-rw-r--r--
2013-06-01 18:10
scmposix.pyc
1.43
KB
-rw-r--r--
2020-03-31 23:33
scmposix.pyo
1.43
KB
-rw-r--r--
2020-03-31 23:33
scmutil.py
31.78
KB
-rw-r--r--
2020-03-31 23:33
scmutil.pyc
35.55
KB
-rw-r--r--
2020-03-31 23:33
scmutil.pyo
35.45
KB
-rw-r--r--
2020-03-31 23:33
scmwindows.py
1.63
KB
-rw-r--r--
2013-06-01 18:10
scmwindows.pyc
1.79
KB
-rw-r--r--
2020-03-31 23:33
scmwindows.pyo
1.79
KB
-rw-r--r--
2020-03-31 23:33
setdiscovery.py
6.73
KB
-rw-r--r--
2013-06-01 18:10
setdiscovery.pyc
5.2
KB
-rw-r--r--
2020-03-31 23:33
setdiscovery.pyo
5.17
KB
-rw-r--r--
2020-03-31 23:33
similar.py
3.56
KB
-rw-r--r--
2013-06-01 18:10
similar.pyc
3.32
KB
-rw-r--r--
2020-03-31 23:33
similar.pyo
3.32
KB
-rw-r--r--
2020-03-31 23:33
simplemerge.py
14.93
KB
-rw-r--r--
2013-06-01 18:10
simplemerge.pyc
12.2
KB
-rw-r--r--
2020-03-31 23:33
simplemerge.pyo
11.77
KB
-rw-r--r--
2020-03-31 23:33
sshpeer.py
7.22
KB
-rw-r--r--
2020-03-31 23:33
sshpeer.pyc
8.78
KB
-rw-r--r--
2020-03-31 23:33
sshpeer.pyo
8.78
KB
-rw-r--r--
2020-03-31 23:33
sshserver.py
4.17
KB
-rw-r--r--
2013-06-01 18:10
sshserver.pyc
5.77
KB
-rw-r--r--
2020-03-31 23:33
sshserver.pyo
5.77
KB
-rw-r--r--
2020-03-31 23:33
sslutil.py
6.49
KB
-rw-r--r--
2013-06-01 18:10
sslutil.pyc
5.57
KB
-rw-r--r--
2020-03-31 23:33
sslutil.pyo
5.57
KB
-rw-r--r--
2020-03-31 23:33
statichttprepo.py
5.05
KB
-rw-r--r--
2013-06-01 18:10
statichttprepo.pyc
7.04
KB
-rw-r--r--
2020-03-31 23:33
statichttprepo.pyo
7.04
KB
-rw-r--r--
2020-03-31 23:33
store.py
16.47
KB
-rw-r--r--
2013-06-01 18:10
store.pyc
20.56
KB
-rw-r--r--
2020-03-31 23:33
store.pyo
20.56
KB
-rw-r--r--
2020-03-31 23:33
strutil.py
913
B
-rw-r--r--
2013-06-01 18:10
strutil.pyc
978
B
-rw-r--r--
2020-03-31 23:33
strutil.pyo
978
B
-rw-r--r--
2020-03-31 23:33
subrepo.py
54.68
KB
-rw-r--r--
2020-03-31 23:33
subrepo.pyc
52.89
KB
-rw-r--r--
2020-03-31 23:33
subrepo.pyo
52.89
KB
-rw-r--r--
2020-03-31 23:33
tags.py
11.22
KB
-rw-r--r--
2013-06-01 18:10
tags.pyc
6.89
KB
-rw-r--r--
2020-03-31 23:33
tags.pyo
6.39
KB
-rw-r--r--
2020-03-31 23:33
templatefilters.py
12.66
KB
-rw-r--r--
2013-06-01 18:10
templatefilters.pyc
17.98
KB
-rw-r--r--
2020-03-31 23:33
templatefilters.pyo
17.98
KB
-rw-r--r--
2020-03-31 23:33
templatekw.py
12.92
KB
-rw-r--r--
2013-06-01 18:10
templatekw.pyc
16.5
KB
-rw-r--r--
2020-03-31 23:33
templatekw.pyo
16.5
KB
-rw-r--r--
2020-03-31 23:33
templater.py
16.28
KB
-rw-r--r--
2013-06-01 18:10
templater.pyc
18.12
KB
-rw-r--r--
2020-03-31 23:33
templater.pyo
18.12
KB
-rw-r--r--
2020-03-31 23:33
transaction.py
5.09
KB
-rw-r--r--
2013-06-01 18:10
transaction.pyc
6.34
KB
-rw-r--r--
2020-03-31 23:33
transaction.pyo
6.34
KB
-rw-r--r--
2020-03-31 23:33
treediscovery.py
5.05
KB
-rw-r--r--
2013-06-01 18:10
treediscovery.pyc
3.67
KB
-rw-r--r--
2020-03-31 23:33
treediscovery.pyo
3.67
KB
-rw-r--r--
2020-03-31 23:33
ui.py
29.33
KB
-rw-r--r--
2013-06-01 18:10
ui.pyc
28.88
KB
-rw-r--r--
2020-03-31 23:33
ui.pyo
28.88
KB
-rw-r--r--
2020-03-31 23:33
unionrepo.py
7.27
KB
-rw-r--r--
2013-06-01 18:10
unionrepo.pyc
8.85
KB
-rw-r--r--
2020-03-31 23:33
unionrepo.pyo
8.82
KB
-rw-r--r--
2020-03-31 23:33
url.py
17.08
KB
-rw-r--r--
2013-06-01 18:10
url.pyc
15.91
KB
-rw-r--r--
2020-03-31 23:33
url.pyo
15.91
KB
-rw-r--r--
2020-03-31 23:33
util.py
60.48
KB
-rw-r--r--
2020-03-31 23:33
util.pyc
63.22
KB
-rw-r--r--
2020-03-31 23:33
util.pyo
63.14
KB
-rw-r--r--
2020-03-31 23:33
verify.py
10.68
KB
-rw-r--r--
2013-06-01 18:10
verify.pyc
9.37
KB
-rw-r--r--
2020-03-31 23:33
verify.pyo
9.37
KB
-rw-r--r--
2020-03-31 23:33
win32.py
13.64
KB
-rw-r--r--
2013-06-01 18:10
win32.pyc
11.5
KB
-rw-r--r--
2020-03-31 23:33
win32.pyo
11.5
KB
-rw-r--r--
2020-03-31 23:33
windows.py
10.76
KB
-rw-r--r--
2020-03-31 23:33
windows.pyc
14.12
KB
-rw-r--r--
2020-03-31 23:33
windows.pyo
14.12
KB
-rw-r--r--
2020-03-31 23:33
wireproto.py
22.98
KB
-rw-r--r--
2020-03-31 23:33
wireproto.pyc
27.79
KB
-rw-r--r--
2020-03-31 23:33
wireproto.pyo
27.79
KB
-rw-r--r--
2020-03-31 23:33
worker.py
4.4
KB
-rw-r--r--
2013-06-01 18:10
worker.pyc
5.31
KB
-rw-r--r--
2020-03-31 23:33
worker.pyo
5.31
KB
-rw-r--r--
2020-03-31 23:33
Save
Rename
# filemerge.py - file-level merge handling for Mercurial # # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from node import short from i18n import _ import util, simplemerge, match, error import os, tempfile, re, filecmp def _toolstr(ui, tool, part, default=""): return ui.config("merge-tools", tool + "." + part, default) def _toolbool(ui, tool, part, default=False): return ui.configbool("merge-tools", tool + "." + part, default) def _toollist(ui, tool, part, default=[]): return ui.configlist("merge-tools", tool + "." + part, default) internals = {} def internaltool(name, trymerge, onfailure=None): '''return a decorator for populating internal merge tool table''' def decorator(func): fullname = 'internal:' + name func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() internals[fullname] = func func.trymerge = trymerge func.onfailure = onfailure return func return decorator def _findtool(ui, tool): if tool in internals: return tool for kn in ("regkey", "regkeyalt"): k = _toolstr(ui, tool, kn) if not k: continue p = util.lookupreg(k, _toolstr(ui, tool, "regname")) if p: p = util.findexe(p + _toolstr(ui, tool, "regappend")) if p: return p exe = _toolstr(ui, tool, "executable", tool) return util.findexe(util.expandpath(exe)) def _picktool(repo, ui, path, binary, symlink): def check(tool, pat, symlink, binary): tmsg = tool if pat: tmsg += " specified for " + pat if not _findtool(ui, tool): if pat: # explicitly requested tool deserves a warning ui.warn(_("couldn't find merge tool %s\n") % tmsg) else: # configured but non-existing tools are more silent ui.note(_("couldn't find merge tool %s\n") % tmsg) elif symlink and not _toolbool(ui, tool, "symlink"): ui.warn(_("tool %s can't handle symlinks\n") % tmsg) elif binary and not _toolbool(ui, tool, "binary"): ui.warn(_("tool %s can't handle binary\n") % tmsg) elif not util.gui() and _toolbool(ui, tool, "gui"): ui.warn(_("tool %s requires a GUI\n") % tmsg) else: return True return False # forcemerge comes from command line arguments, highest priority force = ui.config('ui', 'forcemerge') if force: toolpath = _findtool(ui, force) if toolpath: return (force, util.shellquote(toolpath)) else: # mimic HGMERGE if given tool not found return (force, force) # HGMERGE takes next precedence hgmerge = os.environ.get("HGMERGE") if hgmerge: return (hgmerge, hgmerge) # then patterns for pat, tool in ui.configitems("merge-patterns"): mf = match.match(repo.root, '', [pat]) if mf(path) and check(tool, pat, symlink, False): toolpath = _findtool(ui, tool) return (tool, util.shellquote(toolpath)) # then merge tools tools = {} for k, v in ui.configitems("merge-tools"): t = k.split('.')[0] if t not in tools: tools[t] = int(_toolstr(ui, t, "priority", "0")) names = tools.keys() tools = sorted([(-p, t) for t, p in tools.items()]) uimerge = ui.config("ui", "merge") if uimerge: if uimerge not in names: return (uimerge, uimerge) tools.insert(0, (None, uimerge)) # highest priority tools.append((None, "hgmerge")) # the old default, if found for p, t in tools: if check(t, None, symlink, binary): toolpath = _findtool(ui, t) return (t, util.shellquote(toolpath)) # internal merge or prompt as last resort if symlink or binary: return "internal:prompt", None return "internal:merge", None def _eoltype(data): "Guess the EOL type of a file" if '\0' in data: # binary return None if '\r\n' in data: # Windows return '\r\n' if '\r' in data: # Old Mac return '\r' if '\n' in data: # UNIX return '\n' return None # unknown def _matcheol(file, origfile): "Convert EOL markers in a file to match origfile" tostyle = _eoltype(util.readfile(origfile)) if tostyle: data = util.readfile(file) style = _eoltype(data) if style: newdata = data.replace(style, tostyle) if newdata != data: util.writefile(file, newdata) @internaltool('prompt', False) def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf): """Asks the user which of the local or the other version to keep as the merged version.""" ui = repo.ui fd = fcd.path() if ui.promptchoice(_(" no tool found to merge %s\n" "keep (l)ocal or take (o)ther?") % fd, (_("&Local"), _("&Other")), 0): return _iother(repo, mynode, orig, fcd, fco, fca, toolconf) else: return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf) @internaltool('local', False) def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): """Uses the local version of files as the merged version.""" return 0 @internaltool('other', False) def _iother(repo, mynode, orig, fcd, fco, fca, toolconf): """Uses the other version of files as the merged version.""" repo.wwrite(fcd.path(), fco.data(), fco.flags()) return 0 @internaltool('fail', False) def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf): """ Rather than attempting to merge files that were modified on both branches, it marks them as unresolved. The resolve command must be used to resolve these conflicts.""" return 1 def _premerge(repo, toolconf, files): tool, toolpath, binary, symlink = toolconf if symlink: return 1 a, b, c, back = files ui = repo.ui # do we attempt to simplemerge first? try: premerge = _toolbool(ui, tool, "premerge", not binary) except error.ConfigError: premerge = _toolstr(ui, tool, "premerge").lower() valid = 'keep'.split() if premerge not in valid: _valid = ', '.join(["'" + v + "'" for v in valid]) raise error.ConfigError(_("%s.premerge not valid " "('%s' is neither boolean nor %s)") % (tool, premerge, _valid)) if premerge: r = simplemerge.simplemerge(ui, a, b, c, quiet=True) if not r: ui.debug(" premerge successful\n") return 0 if premerge != 'keep': util.copyfile(back, a) # restore from backup and try again return 1 # continue merging @internaltool('merge', True, _("merging %s incomplete! " "(edit conflicts, then use 'hg resolve --mark')\n")) def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files): """ Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file.""" tool, toolpath, binary, symlink = toolconf if symlink: repo.ui.warn(_('warning: internal:merge cannot merge symlinks ' 'for %s\n') % fcd.path()) return False, 1 r = _premerge(repo, toolconf, files) if r: a, b, c, back = files ui = repo.ui r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other']) return True, r return False, 0 @internaltool('dump', True) def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files): """ Creates three versions of the files to merge, containing the contents of local, other and base. These files can then be used to perform a merge manually. If the file to be merged is named ``a.txt``, these files will accordingly be named ``a.txt.local``, ``a.txt.other`` and ``a.txt.base`` and they will be placed in the same directory as ``a.txt``.""" r = _premerge(repo, toolconf, files) if r: a, b, c, back = files fd = fcd.path() util.copyfile(a, a + ".local") repo.wwrite(fd + ".other", fco.data(), fco.flags()) repo.wwrite(fd + ".base", fca.data(), fca.flags()) return False, r def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files): r = _premerge(repo, toolconf, files) if r: tool, toolpath, binary, symlink = toolconf a, b, c, back = files out = "" env = dict(HG_FILE=fcd.path(), HG_MY_NODE=short(mynode), HG_OTHER_NODE=str(fco.changectx()), HG_BASE_NODE=str(fca.changectx()), HG_MY_ISLINK='l' in fcd.flags(), HG_OTHER_ISLINK='l' in fco.flags(), HG_BASE_ISLINK='l' in fca.flags()) ui = repo.ui args = _toolstr(ui, tool, "args", '$local $base $other') if "$output" in args: out, a = a, back # read input from backup, write to original replace = dict(local=a, base=b, other=c, output=out) args = util.interpolate(r'\$', replace, args, lambda s: util.shellquote(util.localpath(s))) r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, out=ui.fout) return True, r return False, 0 def filemerge(repo, mynode, orig, fcd, fco, fca): """perform a 3-way merge in the working directory mynode = parent node before merge orig = original local filename before merge fco = other file context fca = ancestor file context fcd = local file context for current/destination file """ def temp(prefix, ctx): pre = "%s~%s." % (os.path.basename(ctx.path()), prefix) (fd, name) = tempfile.mkstemp(prefix=pre) data = repo.wwritedata(ctx.path(), ctx.data()) f = os.fdopen(fd, "wb") f.write(data) f.close() return name if not fco.cmp(fcd): # files identical? return None ui = repo.ui fd = fcd.path() binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() symlink = 'l' in fcd.flags() + fco.flags() tool, toolpath = _picktool(repo, ui, fd, binary, symlink) ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" % (tool, fd, binary, symlink)) if tool in internals: func = internals[tool] trymerge = func.trymerge onfailure = func.onfailure else: func = _xmerge trymerge = True onfailure = _("merging %s failed!\n") toolconf = tool, toolpath, binary, symlink if not trymerge: return func(repo, mynode, orig, fcd, fco, fca, toolconf) a = repo.wjoin(fd) b = temp("base", fca) c = temp("other", fco) back = a + ".orig" util.copyfile(a, back) if orig != fco.path(): ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) else: ui.status(_("merging %s\n") % fd) ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) needcheck, r = func(repo, mynode, orig, fcd, fco, fca, toolconf, (a, b, c, back)) if not needcheck: if r: if onfailure: ui.warn(onfailure % fd) else: os.unlink(back) os.unlink(b) os.unlink(c) return r if not r and (_toolbool(ui, tool, "checkconflicts") or 'conflicts' in _toollist(ui, tool, "check")): if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), re.MULTILINE): r = 1 checked = False if 'prompt' in _toollist(ui, tool, "check"): checked = True if ui.promptchoice(_("was merge of '%s' successful (yn)?") % fd, (_("&Yes"), _("&No")), 1): r = 1 if not r and not checked and (_toolbool(ui, tool, "checkchanged") or 'changed' in _toollist(ui, tool, "check")): if filecmp.cmp(a, back): if ui.promptchoice(_(" output file %s appears unchanged\n" "was merge successful (yn)?") % fd, (_("&Yes"), _("&No")), 1): r = 1 if _toolbool(ui, tool, "fixeol"): _matcheol(a, back) if r: if onfailure: ui.warn(onfailure % fd) else: os.unlink(back) os.unlink(b) os.unlink(c) return r # tell hggettext to extract docstrings from these functions: i18nfunctions = internals.values()