Show More
@@ -1,157 +1,154 b'' | |||
|
1 | 1 | # help.py - help data for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2006 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms |
|
6 | 6 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | 7 | |
|
8 | 8 | helptable = { |
|
9 | 9 | "dates|Date Formats": |
|
10 | 10 | r''' |
|
11 | 11 | Some commands (backout, commit, tag) allow the user to specify a date. |
|
12 | 12 | Many date formats are acceptible. Here are some examples: |
|
13 | 13 | |
|
14 | 14 | "Wed Dec 6 13:18:29 2006" (local timezone assumed) |
|
15 | 15 | "Dec 6 13:18 -0600" (year assumed, time offset provided) |
|
16 | 16 | "Dec 6 13:18 UTC" (UTC and GMT are aliases for +0000) |
|
17 | 17 | "Dec 6" (midnight) |
|
18 | 18 | "13:18" (today assumed) |
|
19 | 19 | "3:39" (3:39AM assumed) |
|
20 | 20 | "3:39pm" (15:39) |
|
21 | 21 | "2006-12-6 13:18:29" (ISO 8601 format) |
|
22 | 22 | "2006-12-6 13:18" |
|
23 | 23 | "2006-12-6" |
|
24 | 24 | "12-6" |
|
25 | 25 | "12/6" |
|
26 | 26 | "12/6/6" (Dec 6 2006) |
|
27 | 27 | |
|
28 | 28 | Lastly, there is Mercurial's internal format: |
|
29 | 29 | |
|
30 | 30 | "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC) |
|
31 | 31 | |
|
32 | 32 | This is the internal representation format for dates. unixtime is |
|
33 | 33 | the number of seconds since the epoch (1970-01-01 00:00 UTC). offset |
|
34 | 34 | is the offset of the local timezone, in seconds west of UTC (negative |
|
35 | 35 | if the timezone is east of UTC). |
|
36 | 36 | ''', |
|
37 | 37 | |
|
38 | 38 | 'environment|env|Environment Variables': |
|
39 | 39 | r''' |
|
40 | 40 | HG:: |
|
41 | 41 | Path to the 'hg' executable, automatically passed when running hooks, |
|
42 | 42 | extensions or external tools. If unset or empty, an executable named |
|
43 | 43 | 'hg' (with com/exe/bat/cmd extension on Windows) is searched. |
|
44 | 44 | |
|
45 | 45 | HGEDITOR:: |
|
46 | 46 | This is the name of the editor to use when committing. See EDITOR. |
|
47 | 47 | |
|
48 | 48 | (deprecated, use .hgrc) |
|
49 | 49 | |
|
50 | 50 | HGENCODING:: |
|
51 | 51 | This overrides the default locale setting detected by Mercurial. |
|
52 | 52 | This setting is used to convert data including usernames, |
|
53 | 53 | changeset descriptions, tag names, and branches. This setting can |
|
54 | 54 | be overridden with the --encoding command-line option. |
|
55 | 55 | |
|
56 | 56 | HGENCODINGMODE:: |
|
57 | 57 | This sets Mercurial's behavior for handling unknown characters |
|
58 | 58 | while transcoding user inputs. The default is "strict", which |
|
59 | 59 | causes Mercurial to abort if it can't translate a character. Other |
|
60 | 60 | settings include "replace", which replaces unknown characters, and |
|
61 | 61 | "ignore", which drops them. This setting can be overridden with |
|
62 | 62 | the --encodingmode command-line option. |
|
63 | 63 | |
|
64 | 64 | HGMERGE:: |
|
65 | 65 | An executable to use for resolving merge conflicts. The program |
|
66 | 66 | will be executed with three arguments: local file, remote file, |
|
67 | 67 | ancestor file. |
|
68 | 68 | |
|
69 | The default program is "hgmerge", which is a shell script provided | |
|
70 | by Mercurial with some sensible defaults. | |
|
71 | ||
|
72 | 69 | (deprecated, use .hgrc) |
|
73 | 70 | |
|
74 | 71 | HGRCPATH:: |
|
75 | 72 | A list of files or directories to search for hgrc files. Item |
|
76 | 73 | separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, |
|
77 | 74 | platform default search path is used. If empty, only .hg/hgrc of |
|
78 | 75 | current repository is read. |
|
79 | 76 | |
|
80 | 77 | For each element in path, if a directory, all entries in directory |
|
81 | 78 | ending with ".rc" are added to path. Else, element itself is |
|
82 | 79 | added to path. |
|
83 | 80 | |
|
84 | 81 | HGUSER:: |
|
85 | 82 | This is the string used for the author of a commit. |
|
86 | 83 | |
|
87 | 84 | (deprecated, use .hgrc) |
|
88 | 85 | |
|
89 | 86 | EMAIL:: |
|
90 | 87 | If HGUSER is not set, this will be used as the author for a commit. |
|
91 | 88 | |
|
92 | 89 | LOGNAME:: |
|
93 | 90 | If neither HGUSER nor EMAIL is set, LOGNAME will be used (with |
|
94 | 91 | '@hostname' appended) as the author value for a commit. |
|
95 | 92 | |
|
96 | 93 | VISUAL:: |
|
97 | 94 | This is the name of the editor to use when committing. See EDITOR. |
|
98 | 95 | |
|
99 | 96 | EDITOR:: |
|
100 |
Sometimes Mercurial needs to open a text file in an editor |
|
|
101 |
to modify, for example when writing commit messages |
|
|
102 |
|
|
|
103 |
|
|
|
104 |
|
|
|
97 | Sometimes Mercurial needs to open a text file in an editor | |
|
98 | for a user to modify, for example when writing commit messages. | |
|
99 | The editor it uses is determined by looking at the environment | |
|
100 | variables HGEDITOR, VISUAL and EDITOR, in that order. The first | |
|
101 | non-empty one is chosen. If all of them are empty, the editor | |
|
105 | 102 | defaults to 'vi'. |
|
106 | 103 | |
|
107 | 104 | PYTHONPATH:: |
|
108 | 105 | This is used by Python to find imported modules and may need to be set |
|
109 | 106 | appropriately if Mercurial is not installed system-wide. |
|
110 | 107 | ''', |
|
111 | 108 | |
|
112 | 109 | "patterns|File Name Patterns": r''' |
|
113 | 110 | Mercurial accepts several notations for identifying one or more |
|
114 | 111 | files at a time. |
|
115 | 112 | |
|
116 | 113 | By default, Mercurial treats filenames as shell-style extended |
|
117 | 114 | glob patterns. |
|
118 | 115 | |
|
119 | 116 | Alternate pattern notations must be specified explicitly. |
|
120 | 117 | |
|
121 | 118 | To use a plain path name without any pattern matching, start a |
|
122 | 119 | name with "path:". These path names must match completely, from |
|
123 | 120 | the root of the current repository. |
|
124 | 121 | |
|
125 | 122 | To use an extended glob, start a name with "glob:". Globs are |
|
126 | 123 | rooted at the current directory; a glob such as "*.c" will match |
|
127 | 124 | files ending in ".c" in the current directory only. |
|
128 | 125 | |
|
129 | 126 | The supported glob syntax extensions are "**" to match any string |
|
130 | 127 | across path separators, and "{a,b}" to mean "a or b". |
|
131 | 128 | |
|
132 | 129 | To use a Perl/Python regular expression, start a name with "re:". |
|
133 | 130 | Regexp pattern matching is anchored at the root of the repository. |
|
134 | 131 | |
|
135 | 132 | Plain examples: |
|
136 | 133 | |
|
137 | 134 | path:foo/bar a name bar in a directory named foo in the root of |
|
138 | 135 | the repository |
|
139 | 136 | path:path:name a file or directory named "path:name" |
|
140 | 137 | |
|
141 | 138 | Glob examples: |
|
142 | 139 | |
|
143 | 140 | glob:*.c any name ending in ".c" in the current directory |
|
144 | 141 | *.c any name ending in ".c" in the current directory |
|
145 | 142 | **.c any name ending in ".c" in the current directory, or |
|
146 | 143 | any subdirectory |
|
147 | 144 | foo/*.c any name ending in ".c" in the directory foo |
|
148 | 145 | foo/**.c any name ending in ".c" in the directory foo, or any |
|
149 | 146 | subdirectory |
|
150 | 147 | |
|
151 | 148 | Regexp examples: |
|
152 | 149 | |
|
153 | 150 | re:.*\.c$ any name ending in ".c", anywhere in the repository |
|
154 | 151 | |
|
155 | 152 | ''', |
|
156 | 153 | } |
|
157 | 154 |
@@ -1,91 +1,87 b'' | |||
|
1 | 1 | #!/usr/bin/env python |
|
2 | 2 | # |
|
3 | 3 | # This is the mercurial setup script. |
|
4 | 4 | # |
|
5 | 5 | # 'python setup.py install', or |
|
6 | 6 | # 'python setup.py --help' for more options |
|
7 | 7 | |
|
8 | 8 | import sys |
|
9 | 9 | if not hasattr(sys, 'version_info') or sys.version_info < (2, 3, 0, 'final'): |
|
10 | 10 | raise SystemExit, "Mercurial requires python 2.3 or later." |
|
11 | 11 | |
|
12 | 12 | import os |
|
13 | 13 | from distutils.core import setup, Extension |
|
14 | 14 | from distutils.command.install_data import install_data |
|
15 | 15 | |
|
16 | 16 | import mercurial.version |
|
17 | 17 | |
|
18 | 18 | extra = {} |
|
19 | 19 | |
|
20 | 20 | # py2exe needs to be installed to work |
|
21 | 21 | try: |
|
22 | 22 | import py2exe |
|
23 | 23 | |
|
24 | 24 | # Help py2exe to find win32com.shell |
|
25 | 25 | try: |
|
26 | 26 | import modulefinder |
|
27 | 27 | import win32com |
|
28 | 28 | for p in win32com.__path__[1:]: # Take the path to win32comext |
|
29 | 29 | modulefinder.AddPackagePath("win32com", p) |
|
30 | 30 | pn = "win32com.shell" |
|
31 | 31 | __import__(pn) |
|
32 | 32 | m = sys.modules[pn] |
|
33 | 33 | for p in m.__path__[1:]: |
|
34 | 34 | modulefinder.AddPackagePath(pn, p) |
|
35 | 35 | except ImportError: |
|
36 | 36 | pass |
|
37 | 37 | |
|
38 | 38 | extra['console'] = ['hg'] |
|
39 | 39 | |
|
40 | 40 | except ImportError: |
|
41 | 41 | pass |
|
42 | 42 | |
|
43 | if os.name in ['nt']: | |
|
44 | extra['scripts'] = ['hg'] | |
|
45 | else: | |
|
46 | extra['scripts'] = ['hg', 'hgmerge'] | |
|
47 | ||
|
48 | 43 | # specify version string, otherwise 'hg identify' will be used: |
|
49 | 44 | version = '' |
|
50 | 45 | |
|
51 | 46 | class install_package_data(install_data): |
|
52 | 47 | def finalize_options(self): |
|
53 | 48 | self.set_undefined_options('install', |
|
54 | 49 | ('install_lib', 'install_dir')) |
|
55 | 50 | install_data.finalize_options(self) |
|
56 | 51 | |
|
57 | 52 | mercurial.version.remember_version(version) |
|
58 | 53 | cmdclass = {'install_data': install_package_data} |
|
59 | 54 | |
|
60 | 55 | ext_modules=[ |
|
61 | 56 | Extension('mercurial.mpatch', ['mercurial/mpatch.c']), |
|
62 | 57 | Extension('mercurial.bdiff', ['mercurial/bdiff.c']), |
|
63 | 58 | Extension('mercurial.base85', ['mercurial/base85.c']), |
|
64 | 59 | Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']) |
|
65 | 60 | ] |
|
66 | 61 | |
|
67 | 62 | try: |
|
68 | 63 | import posix |
|
69 | 64 | ext_modules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'])) |
|
70 | 65 | except ImportError: |
|
71 | 66 | pass |
|
72 | 67 | |
|
73 | 68 | setup(name='mercurial', |
|
74 | 69 | version=mercurial.version.get_version(), |
|
75 | 70 | author='Matt Mackall', |
|
76 | 71 | author_email='mpm@selenic.com', |
|
77 | 72 | url='http://selenic.com/mercurial', |
|
78 | 73 | description='Scalable distributed SCM', |
|
79 | 74 | license='GNU GPL', |
|
75 | scripts=['hg'], | |
|
80 | 76 | packages=['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert'], |
|
81 | 77 | ext_modules=ext_modules, |
|
82 | 78 | data_files=[(os.path.join('mercurial', root), |
|
83 | 79 | [os.path.join(root, file_) for file_ in files]) |
|
84 | 80 | for root, dirs, files in os.walk('templates')], |
|
85 | 81 | cmdclass=cmdclass, |
|
86 | 82 | options=dict(py2exe=dict(packages=['hgext']), |
|
87 | 83 | bdist_mpkg=dict(zipdist=True, |
|
88 | 84 | license='COPYING', |
|
89 | 85 | readme='contrib/macosx/Readme.html', |
|
90 | 86 | welcome='contrib/macosx/Welcome.html')), |
|
91 | 87 | **extra) |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now