##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge with stable
Martin von Zweigbergk -
r31119:13bbcd56 merge default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -42,7 +42,8 b' def record(ui, repo, *pats, **opts):'
42
42
43 See :hg:`help dates` for a list of formats valid for -d/--date.
43 See :hg:`help dates` for a list of formats valid for -d/--date.
44
44
45 You will be prompted for whether to record changes to each
45 If using the text interface (see :hg:`help config`),
46 you will be prompted for whether to record changes to each
46 modified file, and for files with multiple changes, for each
47 modified file, and for files with multiple changes, for each
47 change to use. For each query, the following responses are
48 change to use. For each query, the following responses are
48 possible::
49 possible::
Show file before | Show file after | Hide comments
@@ -70,9 +70,9 b' default = %s'
70 # path aliases to other clones of this repo in URLs or filesystem paths
70 # path aliases to other clones of this repo in URLs or filesystem paths
71 # (see 'hg help config.paths' for more info)
71 # (see 'hg help config.paths' for more info)
72 #
72 #
73 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
73 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
74 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
74 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
75 # my-clone = /home/jdoe/jdoes-clone
75 # my-clone = /home/jdoe/jdoes-clone
76
76
77 [ui]
77 [ui]
78 # name and email (local to this repository, optional), e.g.
78 # name and email (local to this repository, optional), e.g.
@@ -85,10 +85,10 b' default = %s'
85 # path aliases to other clones of this repo in URLs or filesystem paths
85 # path aliases to other clones of this repo in URLs or filesystem paths
86 # (see 'hg help config.paths' for more info)
86 # (see 'hg help config.paths' for more info)
87 #
87 #
88 # default = http://example.com/hg/example-repo
88 # default = http://example.com/hg/example-repo
89 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
89 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
90 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
90 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
91 # my-clone = /home/jdoe/jdoes-clone
91 # my-clone = /home/jdoe/jdoes-clone
92
92
93 [ui]
93 [ui]
94 # name and email (local to this repository, optional), e.g.
94 # name and email (local to this repository, optional), e.g.
Show file before | Show file after | Hide comments
@@ -120,9 +120,12 b' def _posixworker(ui, func, staticargs, a'
120 break
120 break
121 else:
121 else:
122 raise
122 raise
123 if p:
123 if not p:
124 pids.discard(p)
124 # skip subsequent steps, because child process should
125 st = _exitstatus(st)
125 # be still running in this case
126 continue
127 pids.discard(p)
128 st = _exitstatus(st)
126 if st and not problem[0]:
129 if st and not problem[0]:
127 problem[0] = st
130 problem[0] = st
128 def sigchldhandler(signum, frame):
131 def sigchldhandler(signum, frame):
@@ -145,12 +148,16 b' def _posixworker(ui, func, staticargs, a'
145 # may do some clean-ups which could cause surprises like deadlock.
148 # may do some clean-ups which could cause surprises like deadlock.
146 # see sshpeer.cleanup for example.
149 # see sshpeer.cleanup for example.
147 try:
150 try:
148 scmutil.callcatch(ui, workerfunc)
151 try:
152 scmutil.callcatch(ui, workerfunc)
153 finally:
154 ui.flush()
149 except KeyboardInterrupt:
155 except KeyboardInterrupt:
150 os._exit(255)
156 os._exit(255)
151 except: # never return, therefore no re-raises
157 except: # never return, therefore no re-raises
152 try:
158 try:
153 ui.traceback()
159 ui.traceback()
160 ui.flush()
154 finally:
161 finally:
155 os._exit(255)
162 os._exit(255)
156 else:
163 else:
Show file before | Show file after | Hide comments
@@ -35,9 +35,9 b" Issue1199: Can't use '%' in hgrc (eg url"
35 # path aliases to other clones of this repo in URLs or filesystem paths
35 # path aliases to other clones of this repo in URLs or filesystem paths
36 # (see 'hg help config.paths' for more info)
36 # (see 'hg help config.paths' for more info)
37 #
37 #
38 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
38 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
39 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
39 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
40 # my-clone = /home/jdoe/jdoes-clone
40 # my-clone = /home/jdoe/jdoes-clone
41
41
42 [ui]
42 [ui]
43 # name and email (local to this repository, optional), e.g.
43 # name and email (local to this repository, optional), e.g.
Show file before | Show file after | Hide comments
@@ -33,9 +33,9 b' Cloning with a password in the URL shoul'
33 # path aliases to other clones of this repo in URLs or filesystem paths
33 # path aliases to other clones of this repo in URLs or filesystem paths
34 # (see 'hg help config.paths' for more info)
34 # (see 'hg help config.paths' for more info)
35 #
35 #
36 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
36 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
37 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
37 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
38 # my-clone = /home/jdoe/jdoes-clone
38 # my-clone = /home/jdoe/jdoes-clone
39
39
40 [ui]
40 [ui]
41 # name and email (local to this repository, optional), e.g.
41 # name and email (local to this repository, optional), e.g.
Show file before | Show file after | Hide comments
@@ -39,9 +39,10 b' help record (record)'
39
39
40 See 'hg help dates' for a list of formats valid for -d/--date.
40 See 'hg help dates' for a list of formats valid for -d/--date.
41
41
42 You will be prompted for whether to record changes to each modified file,
42 If using the text interface (see 'hg help config'), you will be prompted
43 and for files with multiple changes, for each change to use. For each
43 for whether to record changes to each modified file, and for files with
44 query, the following responses are possible:
44 multiple changes, for each change to use. For each query, the following
45 responses are possible:
45
46
46 y - record this change
47 y - record this change
47 n - skip this change
48 n - skip this change
Show file before | Show file after | Hide comments
@@ -22,9 +22,10 b' Record help'
22
22
23 See 'hg help dates' for a list of formats valid for -d/--date.
23 See 'hg help dates' for a list of formats valid for -d/--date.
24
24
25 You will be prompted for whether to record changes to each modified file,
25 If using the text interface (see 'hg help config'), you will be prompted
26 and for files with multiple changes, for each change to use. For each
26 for whether to record changes to each modified file, and for files with
27 query, the following responses are possible:
27 multiple changes, for each change to use. For each query, the following
28 responses are possible:
28
29
29 y - record this change
30 y - record this change
30 n - skip this change
31 n - skip this change
Show file before | Show file after | Hide comments
@@ -43,9 +43,9 b''
43 # path aliases to other clones of this repo in URLs or filesystem paths
43 # path aliases to other clones of this repo in URLs or filesystem paths
44 # (see 'hg help config.paths' for more info)
44 # (see 'hg help config.paths' for more info)
45 #
45 #
46 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
46 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
47 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
47 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
48 # my-clone = /home/jdoe/jdoes-clone
48 # my-clone = /home/jdoe/jdoes-clone
49
49
50 [ui]
50 [ui]
51 # name and email (local to this repository, optional), e.g.
51 # name and email (local to this repository, optional), e.g.
@@ -95,9 +95,9 b''
95 # path aliases to other clones of this repo in URLs or filesystem paths
95 # path aliases to other clones of this repo in URLs or filesystem paths
96 # (see 'hg help config.paths' for more info)
96 # (see 'hg help config.paths' for more info)
97 #
97 #
98 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
98 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
99 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
99 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
100 # my-clone = /home/jdoe/jdoes-clone
100 # my-clone = /home/jdoe/jdoes-clone
101
101
102 [ui]
102 [ui]
103 # name and email (local to this repository, optional), e.g.
103 # name and email (local to this repository, optional), e.g.
Show file before | Show file after | Hide comments
@@ -56,3 +56,38 b' update to rev 0 with a date'
56 [255]
56 [255]
57
57
58 $ cd ..
58 $ cd ..
59
60 update with worker processes
61
62 #if no-windows
63
64 $ cat <<EOF > forceworker.py
65 > from mercurial import extensions, worker
66 > def nocost(orig, ui, costperop, nops):
67 > return worker._numworkers(ui) > 1
68 > def uisetup(ui):
69 > extensions.wrapfunction(worker, 'worthwhile', nocost)
70 > EOF
71
72 $ hg init worker
73 $ cd worker
74 $ cat <<EOF >> .hg/hgrc
75 > [extensions]
76 > forceworker = $TESTTMP/forceworker.py
77 > [worker]
78 > numcpus = 4
79 > EOF
80 $ for i in `python $TESTDIR/seq.py 1 100`; do
81 > echo $i > $i
82 > done
83 $ hg ci -qAm 'add 100 files'
84
85 $ hg update null
86 0 files updated, 0 files merged, 100 files removed, 0 files unresolved
87 $ hg update -v | grep 100
88 getting 100
89 100 files updated, 0 files merged, 0 files removed, 0 files unresolved
90
91 $ cd ..
92
93 #endif
Show file before | Show file after | Hide comments
@@ -134,9 +134,9 b' Largefiles is NOT enabled in the clone i'
134 # path aliases to other clones of this repo in URLs or filesystem paths
134 # path aliases to other clones of this repo in URLs or filesystem paths
135 # (see 'hg help config.paths' for more info)
135 # (see 'hg help config.paths' for more info)
136 #
136 #
137 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
137 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
138 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
138 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
139 # my-clone = /home/jdoe/jdoes-clone
139 # my-clone = /home/jdoe/jdoes-clone
140
140
141 [ui]
141 [ui]
142 # name and email (local to this repository, optional), e.g.
142 # name and email (local to this repository, optional), e.g.
@@ -695,9 +695,9 b' The local repo enables largefiles if a l'
695 # path aliases to other clones of this repo in URLs or filesystem paths
695 # path aliases to other clones of this repo in URLs or filesystem paths
696 # (see 'hg help config.paths' for more info)
696 # (see 'hg help config.paths' for more info)
697 #
697 #
698 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
698 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
699 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
699 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
700 # my-clone = /home/jdoe/jdoes-clone
700 # my-clone = /home/jdoe/jdoes-clone
701
701
702 [ui]
702 [ui]
703 # name and email (local to this repository, optional), e.g.
703 # name and email (local to this repository, optional), e.g.
Show file before | Show file after | Hide comments
@@ -48,9 +48,9 b' Test basic functionality of url#rev synt'
48 # path aliases to other clones of this repo in URLs or filesystem paths
48 # path aliases to other clones of this repo in URLs or filesystem paths
49 # (see 'hg help config.paths' for more info)
49 # (see 'hg help config.paths' for more info)
50 #
50 #
51 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
51 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
52 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
52 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
53 # my-clone = /home/jdoe/jdoes-clone
53 # my-clone = /home/jdoe/jdoes-clone
54
54
55 [ui]
55 [ui]
56 # name and email (local to this repository, optional), e.g.
56 # name and email (local to this repository, optional), e.g.
General Comments 0
You need to be logged in to leave comments. Login now