Show More
@@ -3304,9 +3304,10 b' def log(ui, repo, *pats, **opts):' | |||||
3304 |
|
3304 | |||
3305 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
3305 | With --graph the revisions are shown as an ASCII art DAG with the most | |
3306 | recent changeset at the top. |
|
3306 | recent changeset at the top. | |
3307 |
'o' is a changeset, '@' is a working directory parent, ' |
|
3307 | 'o' is a changeset, '@' is a working directory parent, '_' closes a branch, | |
3308 | and '+' represents a fork where the changeset from the lines below is a |
|
3308 | 'x' is obsolete, '*' is unstable, and '+' represents a fork where the | |
3309 |
parent of the 'o' merge on the same |
|
3309 | changeset from the lines below is a parent of the 'o' merge on the same | |
|
3310 | line. | |||
3310 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
|
3311 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place | |
3311 | of a '|' indicates one or more revisions in a path are omitted. |
|
3312 | of a '|' indicates one or more revisions in a path are omitted. | |
3312 |
|
3313 |
@@ -24,7 +24,7 b' web.cacerts.' | |||||
24 | Some notes about using SSH with Mercurial: |
|
24 | Some notes about using SSH with Mercurial: | |
25 |
|
25 | |||
26 | - SSH requires an accessible shell account on the destination machine |
|
26 | - SSH requires an accessible shell account on the destination machine | |
27 |
and a copy of hg in the remote path or specified with |
|
27 | and a copy of hg in the remote path or specified with remotecmd. | |
28 | - path is relative to the remote user's home directory by default. Use |
|
28 | - path is relative to the remote user's home directory by default. Use | |
29 | an extra slash at the start of a path to specify an absolute path:: |
|
29 | an extra slash at the start of a path to specify an absolute path:: | |
30 |
|
30 |
@@ -67,6 +67,26 b' Python {py} detected.' | |||||
67 | printf(error, file=sys.stderr) |
|
67 | printf(error, file=sys.stderr) | |
68 | sys.exit(1) |
|
68 | sys.exit(1) | |
69 |
|
69 | |||
|
70 | # We don't yet officially support Python 3. But we want to allow developers to | |||
|
71 | # hack on. Detect and disallow running on Python 3 by default. But provide a | |||
|
72 | # backdoor to enable working on Python 3. | |||
|
73 | if sys.version_info[0] != 2: | |||
|
74 | badpython = True | |||
|
75 | ||||
|
76 | # Allow Python 3 from source checkouts. | |||
|
77 | if os.path.isdir('.hg'): | |||
|
78 | badpython = False | |||
|
79 | ||||
|
80 | if badpython: | |||
|
81 | error = """ | |||
|
82 | Mercurial only supports Python 2.7. | |||
|
83 | Python {py} detected. | |||
|
84 | Please re-run with Python 2.7. | |||
|
85 | """.format(py=sys.version_info) | |||
|
86 | ||||
|
87 | printf(error, file=sys.stderr) | |||
|
88 | sys.exit(1) | |||
|
89 | ||||
70 | # Solaris Python packaging brain damage |
|
90 | # Solaris Python packaging brain damage | |
71 | try: |
|
91 | try: | |
72 | import hashlib |
|
92 | import hashlib |
General Comments 0
You need to be logged in to leave comments.
Login now