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