Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable contrib: check in files used by binary installer

These files used to be generated by patchin their Mercurial equivalents.
Now we version them directly.

Changeset d0dfabf98ab4

Parent c7a4320466db

by Steve Borho

Changes to 3 files · Browse files at d0dfabf98ab4 Showing diff from parent c7a4320466db Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​ReadMe.html Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> + <head> + <title>Mercurial for Windows</title> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <style type="text/css"> + <!-- + html { + font-family: sans-serif; + margin: 1em 2em; + } + + p { + margin-top: 0.5em; + margin-bottom: 0.5em; + } + + pre { + margin: 0.25em 0em; + padding: 0.5em; + background-color: #EEE; + border: thin solid #CCC; + } + + .indented { + padding-left: 10pt; + } + --> + </style> + </head> + + <body> + <h1>Mercurial for Windows</h1> + + <p>Welcome to Mercurial for Windows!</p> + + <p> + Mercurial is a command-line application. You must run it from + the Windows command prompt (or if you're hard core, a <a + href="http://www.mingw.org/">MinGW</a> shell). + </p> + + <p class="indented"> + <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a> + msys startup script uses rxvt which has problems setting up + standard input and output. Running bash directly works + correctly.</i> + </p> + + <p> + For documentation, please visit the <a + href="http://mercurial.selenic.com/">Mercurial web site</a>. + You can also download a free book, <a + href="http://hgbook.red-bean.com/">Mercurial: The Definitive + Guide</a>. + </p> + + <p> + By default, Mercurial installs to <tt>C:\Program + Files\Mercurial</tt>. The Mercurial command is called + <tt>hg.exe</tt>. + </p> + + <h1>Testing Mercurial after you've installed it</h1> + + <p> + The easiest way to check that Mercurial is installed properly is + to just type the following at the command prompt: + </p> + + <pre> +hg +</pre> + + <p> + This command should print a useful help message. If it does, + other Mercurial commands should work fine for you. + </p> + + <h1>Configuration notes</h1> + <h4>Default editor</h4> + <p> + The default editor for commit messages is 'notepad'. You can set + the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable + to specify your preference or set it in <tt>mercurial.ini</tt>: + </p> + <pre> +[ui] +editor = whatever +</pre> + + <h4>Configuring a Merge program</h4> + <p> + It should be emphasized that Mercurial by itself doesn't attempt + to do a Merge at the file level, neither does it make any + attempt to Resolve the conflicts. + </p> + + <p> + By default, Mercurial will use the merge program defined by the + <tt>HGMERGE</tt> environment variable, or uses the one defined + in the <tt>mercurial.ini</tt> file. (see <a + href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram</a> + on the Mercurial Wiki for more information) + </p> + + <h1>Reporting problems</h1> + + <p> + Before you report any problems, please consult the <a + href="http://mercurial.selenic.com/">Mercurial web site</a> + and see if your question is already in our list of <a + href="http://mercurial.selenic.com/wiki/FAQ">Frequently + Answered Questions</a> (the "FAQ"). + </p> + + <p> + If you cannot find an answer to your question, please feel free + to send mail to the Mercurial mailing list, at <a + href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>. + <b>Remember</b>, the more useful information you include in your + report, the easier it will be for us to help you! + </p> + + <p> + If you are IRC-savvy, that's usually the fastest way to get + help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>. + </p> + + <h1>Author and copyright information</h1> + + <p> + Mercurial was written by <a href="http://www.selenic.com">Matt + Mackall</a>, and is maintained by Matt and a team of volunteers. + </p> + + <p> + The Windows installer was written by <a + href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>. + </p> + + <p>TortoiseHg was written by + <a href="mailto:teekaysoh@gmail.com>">TK Soh</a>. It + also has it's own + <a href="http://bitbucket.org/tortoisehg/stable/wiki/FAQ">FAQ</a></p> + </p> + + <p> + Mercurial is Copyright 2005-2009 Matt Mackall and others. See + the <tt>Contributors.txt</tt> file for a list of contributors. + </p> + + <p> + Mercurial is free software; you can redistribute it and/or + modify it under the terms of the <a + href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU + General Public License version 2</a> as published by the Free + Software Foundation. + </p> + + <p> + Mercurial is distributed in the hope that it will be useful, but + <b>without any warranty</b>; without even the implied warranty + of <b>merchantability</b> or <b>fitness for a particular + purpose</b>. See the GNU General Public License for more + details. + </p> + </body> +</html>
Change 1 of 1 Show Entire File contrib/​win32/​hg Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
@@ -0,0 +1,38 @@
+#!/usr/bin/env python +# +# mercurial - scalable distributed SCM +# +# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> +# +# This software may be used and distributed according to the terms of the +# GNU General Public License version 2, incorporated herein by reference. + +import os, sys + +cwd = os.getcwd() +if cwd in sys.path: + # Always remove current directory for Windows exe + if hasattr(sys, "frozen"): + sys.path.remove(cwd) + elif os.path.dirname(__file__) != cwd: + sys.path.remove(cwd) + sys.path.append(cwd) + +# enable importing on demand to reduce startup time +try: + from mercurial import demandimport; demandimport.enable() +except ImportError: + import sys + sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" % + ' '.join(sys.path)) + sys.stderr.write("(check your install and PYTHONPATH)\n") + sys.exit(-1) + +import sys +import mercurial.util +import mercurial.dispatch + +for fp in (sys.stdin, sys.stdout, sys.stderr): + mercurial.util.set_binary(fp) + +mercurial.dispatch.run()
Change 1 of 1 Show Entire File contrib/​win32/​postinstall.txt Stacked
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
@@ -0,0 +1,10 @@
+Welcome to Mercurial for Windows! +--------------------------------- + +For configuration and usage directions, please read the ReadMe.html +file that comes with this package. + +Check the TortoiseHg and Mercurial release notes at: + + http://bitbucket.org/tortoisehg/stable/wiki/ReleaseNotes + http://mercurial.selenic.com/wiki/WhatsNew