Show More
@@ -26,8 +26,12 b' from mercurial import (' | |||||
26 | cmdutil, |
|
26 | cmdutil, | |
27 | commands, |
|
27 | commands, | |
28 | error, |
|
28 | error, | |
|
29 | localrepo, | |||
29 | registrar, |
|
30 | registrar, | |
30 | ) |
|
31 | ) | |
|
32 | from mercurial.utils import ( | |||
|
33 | urlutil, | |||
|
34 | ) | |||
31 |
|
35 | |||
32 | cmdtable = {} |
|
36 | cmdtable = {} | |
33 | command = registrar.command(cmdtable) |
|
37 | command = registrar.command(cmdtable) | |
@@ -73,23 +77,49 b" testedwith = b'ships-with-hg-core'" | |||||
73 | b'', |
|
77 | b'', | |
74 | _(b'repository to clone from'), |
|
78 | _(b'repository to clone from'), | |
75 | ), |
|
79 | ), | |
|
80 | ( | |||
|
81 | b'', | |||
|
82 | b'dest', | |||
|
83 | b'', | |||
|
84 | _(b'repository to update to REV (possibly cloning)'), | |||
|
85 | ), | |||
|
86 | ( | |||
|
87 | b'', | |||
|
88 | b'initial-clone-minimal', | |||
|
89 | False, | |||
|
90 | _( | |||
|
91 | b'Pull only the prescribed revision upon initial cloning. ' | |||
|
92 | b'This has the side effect of ignoring clone-bundles, ' | |||
|
93 | b'which if often slower on the client side and stressful ' | |||
|
94 | b'to the server than applying available clone bundles.' | |||
|
95 | ), | |||
|
96 | ), | |||
76 | ], |
|
97 | ], | |
77 | _(b'hg admin::chainsaw-update [OPTION] --rev REV --source SOURCE...'), |
|
98 | _( | |
|
99 | b'hg admin::chainsaw-update [OPTION] --rev REV --source SOURCE --dest DEST' | |||
|
100 | ), | |||
78 | helpbasic=True, |
|
101 | helpbasic=True, | |
|
102 | norepo=True, | |||
79 | ) |
|
103 | ) | |
80 |
def update(ui, |
|
104 | def update(ui, **opts): | |
81 | """pull and update to a given revision, no matter what, (EXPERIMENTAL) |
|
105 | """pull and update to a given revision, no matter what, (EXPERIMENTAL) | |
82 |
|
106 | |||
83 | Context of application: *some* Continuous Integration (CI) systems, |
|
107 | Context of application: *some* Continuous Integration (CI) systems, | |
84 | packaging or deployment tools. |
|
108 | packaging or deployment tools. | |
85 |
|
109 | |||
86 |
Wanted end result: |
|
110 | Wanted end result: local repository at the given REPO_PATH, having the | |
|
111 | latest changes to the given revision and with a clean working directory | |||
|
112 | updated at the given revision. | |||
87 |
|
113 | |||
88 | chainsaw-update pulls from one source, then updates the working directory |
|
114 | chainsaw-update pulls from one source, then updates the working directory | |
89 | to the given revision, overcoming anything that would stand in the way. |
|
115 | to the given revision, overcoming anything that would stand in the way. | |
90 |
|
116 | |||
91 | By default, it will: |
|
117 | By default, it will: | |
92 |
|
118 | |||
|
119 | - clone if the local repo does not exist yet, **removing any directory | |||
|
120 | at the given path** that would not be a Mercurial repository. | |||
|
121 | The initial clone is full by default, so that clonebundles can be | |||
|
122 | applied. Use the --initial-clone-minimal flag to avoid this. | |||
93 | - break locks if needed, leading to possible corruption if there |
|
123 | - break locks if needed, leading to possible corruption if there | |
94 | is a concurrent write access. |
|
124 | is a concurrent write access. | |
95 | - perform recovery actions if needed |
|
125 | - perform recovery actions if needed | |
@@ -116,10 +146,36 b' def update(ui, repo, **opts):' | |||||
116 | """ |
|
146 | """ | |
117 | rev = opts['rev'] |
|
147 | rev = opts['rev'] | |
118 | source = opts['source'] |
|
148 | source = opts['source'] | |
|
149 | repo_path = opts['dest'] | |||
119 | if not rev: |
|
150 | if not rev: | |
120 | raise error.InputError(_(b'specify a target revision with --rev')) |
|
151 | raise error.InputError(_(b'specify a target revision with --rev')) | |
121 | if not source: |
|
152 | if not source: | |
122 | raise error.InputError(_(b'specify a pull path with --source')) |
|
153 | raise error.InputError(_(b'specify a pull path with --source')) | |
|
154 | if not repo_path: | |||
|
155 | raise error.InputError(_(b'specify a repo path with --dest')) | |||
|
156 | repo_path = urlutil.urllocalpath(repo_path) | |||
|
157 | ||||
|
158 | try: | |||
|
159 | repo = localrepo.instance(ui, repo_path, create=False) | |||
|
160 | repo_created = False | |||
|
161 | ui.status(_(b'loaded repository at "%s"\n' % repo_path)) | |||
|
162 | except error.RepoError: | |||
|
163 | try: | |||
|
164 | shutil.rmtree(repo_path) | |||
|
165 | except FileNotFoundError: | |||
|
166 | ui.status(_(b'no such directory: "%s"\n' % repo_path)) | |||
|
167 | else: | |||
|
168 | ui.status( | |||
|
169 | _( | |||
|
170 | b'removed non-repository file or directory ' | |||
|
171 | b'at "%s"' % repo_path | |||
|
172 | ) | |||
|
173 | ) | |||
|
174 | ||||
|
175 | ui.status(_(b'creating repository at "%s"\n' % repo_path)) | |||
|
176 | repo = localrepo.instance(ui, repo_path, create=True) | |||
|
177 | repo_created = True | |||
|
178 | ||||
123 | if repo.svfs.tryunlink(b'lock'): |
|
179 | if repo.svfs.tryunlink(b'lock'): | |
124 | ui.status(_(b'had to break store lock\n')) |
|
180 | ui.status(_(b'had to break store lock\n')) | |
125 | if repo.vfs.tryunlink(b'wlock'): |
|
181 | if repo.vfs.tryunlink(b'wlock'): | |
@@ -129,10 +185,14 b' def update(ui, repo, **opts):' | |||||
129 | repo.recover() |
|
185 | repo.recover() | |
130 |
|
186 | |||
131 | ui.status(_(b'pulling from %s\n') % source) |
|
187 | ui.status(_(b'pulling from %s\n') % source) | |
|
188 | if repo_created and not opts.get('initial_clone_minimal'): | |||
|
189 | pull_revs = [] | |||
|
190 | else: | |||
|
191 | pull_revs = [rev] | |||
132 | overrides = {(b'ui', b'quiet'): True} |
|
192 | overrides = {(b'ui', b'quiet'): True} | |
133 | with ui.configoverride(overrides, b'chainsaw-update'): |
|
193 | with repo.ui.configoverride(overrides, b'chainsaw-update'): | |
134 | pull = cmdutil.findcmd(b'pull', commands.table)[1][0] |
|
194 | pull = cmdutil.findcmd(b'pull', commands.table)[1][0] | |
135 |
pull(ui, repo, source, rev= |
|
195 | pull(repo.ui, repo, source, rev=pull_revs, remote_hidden=False) | |
136 |
|
196 | |||
137 | purge = cmdutil.findcmd(b'purge', commands.table)[1][0] |
|
197 | purge = cmdutil.findcmd(b'purge', commands.table)[1][0] | |
138 | purge( |
|
198 | purge( |
@@ -58,26 +58,40 b' setup' | |||||
58 | Actual tests |
|
58 | Actual tests | |
59 | ============ |
|
59 | ============ | |
60 |
|
60 | |||
61 | Simple invocation |
|
61 | Initial cloning if needed | |
62 | ----------------- |
|
62 | ------------------------- | |
63 |
|
63 | |||
64 | $ hg init repo |
|
64 | $ hg admin::chainsaw-update --dest repo --rev default --source ./src | |
65 | $ cd repo |
|
65 | no such directory: "repo" | |
66 | $ hg admin::chainsaw-update --rev default --source ../src |
|
66 | creating repository at "repo" | |
67 | recovering after interrupted transaction, if any |
|
67 | recovering after interrupted transaction, if any | |
68 | no interrupted transaction available |
|
68 | no interrupted transaction available | |
69 |
pulling from . |
|
69 | pulling from ./src | |
70 | updating to revision 'default' |
|
70 | updating to revision 'default' | |
71 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
71 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
72 | chainsaw-update to revision 'default' for repository at '$TESTTMP/repo' done |
|
72 | chainsaw-update to revision 'default' for repository at '$TESTTMP/repo' done | |
73 |
|
73 | |||
|
74 | $ cd repo | |||
74 | $ hg log -G |
|
75 | $ hg log -G | |
75 |
@ changeset: |
|
76 | @ changeset: 3:bfcb8e629987 | |
76 | | tag: tip |
|
77 | | tag: tip | |
|
78 | | parent: 0:06f48e4098b8 | |||
77 | | user: test |
|
79 | | user: test | |
78 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
80 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
79 | | summary: B_0 |
|
81 | | summary: B_0 | |
80 | | |
|
82 | | | |
|
83 | | o changeset: 2:7fd8de258aa4 | |||
|
84 | | | branch: A | |||
|
85 | | | user: test | |||
|
86 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
87 | | | summary: A_1 | |||
|
88 | | | | |||
|
89 | | o changeset: 1:ae1692b8aadb | |||
|
90 | |/ branch: A | |||
|
91 | | user: test | |||
|
92 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
93 | | summary: A_0 | |||
|
94 | | | |||
81 | o changeset: 0:06f48e4098b8 |
|
95 | o changeset: 0:06f48e4098b8 | |
82 | user: test |
|
96 | user: test | |
83 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
97 | date: Thu Jan 01 00:00:00 1970 +0000 | |
@@ -103,7 +117,8 b' from the current hostname (happens a lot' | |||||
103 | wlock: (.*?), process 171814, host invalid.host.test/effffffc \((\d+)s\) (re) |
|
117 | wlock: (.*?), process 171814, host invalid.host.test/effffffc \((\d+)s\) (re) | |
104 | [2] |
|
118 | [2] | |
105 |
|
119 | |||
106 | $ hg admin::chainsaw-update --no-purge-ignored --rev default --source ../src |
|
120 | $ hg admin::chainsaw-update --no-purge-ignored --dest . --rev default --source ../src | |
|
121 | loaded repository at "." | |||
107 | had to break store lock |
|
122 | had to break store lock | |
108 | had to break working copy lock |
|
123 | had to break working copy lock | |
109 | recovering after interrupted transaction, if any |
|
124 | recovering after interrupted transaction, if any | |
@@ -127,9 +142,39 b' purging.' | |||||
127 | C root |
|
142 | C root | |
128 |
|
143 | |||
129 | $ echo 2 > ../src/foo |
|
144 | $ echo 2 > ../src/foo | |
130 |
$ hg -R ../src commit -m |
|
145 | $ hg -R ../src commit -mB_1 | |
131 | $ hg admin::chainsaw-update --rev default --source ../src -q |
|
146 | $ hg admin::chainsaw-update --dest . --rev default --source ../src -q | |
132 | no interrupted transaction available |
|
147 | no interrupted transaction available | |
|
148 | $ hg log -G | |||
|
149 | @ changeset: 4:973ab81c95fb | |||
|
150 | | tag: tip | |||
|
151 | | user: test | |||
|
152 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
153 | | summary: B_1 | |||
|
154 | | | |||
|
155 | o changeset: 3:bfcb8e629987 | |||
|
156 | | parent: 0:06f48e4098b8 | |||
|
157 | | user: test | |||
|
158 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
159 | | summary: B_0 | |||
|
160 | | | |||
|
161 | | o changeset: 2:7fd8de258aa4 | |||
|
162 | | | branch: A | |||
|
163 | | | user: test | |||
|
164 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
165 | | | summary: A_1 | |||
|
166 | | | | |||
|
167 | | o changeset: 1:ae1692b8aadb | |||
|
168 | |/ branch: A | |||
|
169 | | user: test | |||
|
170 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
171 | | summary: A_0 | |||
|
172 | | | |||
|
173 | o changeset: 0:06f48e4098b8 | |||
|
174 | user: test | |||
|
175 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
176 | summary: R_0 | |||
|
177 | ||||
133 | $ hg status -A |
|
178 | $ hg status -A | |
134 | C foo |
|
179 | C foo | |
135 | C root |
|
180 | C root | |
@@ -148,7 +193,7 b' the --no-purge-ignored flag is passed, b' | |||||
148 | C foo |
|
193 | C foo | |
149 | C root |
|
194 | C root | |
150 |
|
195 | |||
151 | $ hg admin::chainsaw-update --no-purge-ignored --rev default --source ../src -q |
|
196 | $ hg admin::chainsaw-update --no-purge-ignored --dest . --rev default --source ../src -q | |
152 | no interrupted transaction available |
|
197 | no interrupted transaction available | |
153 | $ hg status --all |
|
198 | $ hg status --all | |
154 | I bar |
|
199 | I bar | |
@@ -158,7 +203,7 b' the --no-purge-ignored flag is passed, b' | |||||
158 | $ cat bar |
|
203 | $ cat bar | |
159 | ignored |
|
204 | ignored | |
160 |
|
205 | |||
161 | $ hg admin::chainsaw-update --rev default --source ../src -q |
|
206 | $ hg admin::chainsaw-update --dest . --rev default --source ../src -q | |
162 | no interrupted transaction available |
|
207 | no interrupted transaction available | |
163 | $ hg status --all |
|
208 | $ hg status --all | |
164 | C .hgignore |
|
209 | C .hgignore | |
@@ -167,3 +212,44 b' the --no-purge-ignored flag is passed, b' | |||||
167 | $ test -f bar |
|
212 | $ test -f bar | |
168 | [1] |
|
213 | [1] | |
169 |
|
214 | |||
|
215 | test --minimal-initial-cloning variant | |||
|
216 | -------------------------------------- | |||
|
217 | ||||
|
218 | With `--minimal-initial-cloning`, there is no "requesting all changes" | |||
|
219 | message. Hence clone bundles would be bypassed (TODO test both cases | |||
|
220 | # with an actual clone-bundle) | |||
|
221 | ||||
|
222 | $ cd .. | |||
|
223 | $ hg admin::chainsaw-update --dest repo2 --rev default --source src --initial-clone-minimal | |||
|
224 | no such directory: "repo2" | |||
|
225 | creating repository at "repo2" | |||
|
226 | recovering after interrupted transaction, if any | |||
|
227 | no interrupted transaction available | |||
|
228 | pulling from src | |||
|
229 | updating to revision 'default' | |||
|
230 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
231 | chainsaw-update to revision 'default' for repository at '$TESTTMP/repo2' done | |||
|
232 | ||||
|
233 | $ cd repo2 | |||
|
234 | $ hg log -G | |||
|
235 | @ changeset: 2:973ab81c95fb | |||
|
236 | | tag: tip | |||
|
237 | | user: test | |||
|
238 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
239 | | summary: B_1 | |||
|
240 | | | |||
|
241 | o changeset: 1:bfcb8e629987 | |||
|
242 | | user: test | |||
|
243 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
244 | | summary: B_0 | |||
|
245 | | | |||
|
246 | o changeset: 0:06f48e4098b8 | |||
|
247 | user: test | |||
|
248 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
249 | summary: R_0 | |||
|
250 | ||||
|
251 | $ hg status -A | |||
|
252 | C foo | |||
|
253 | C root | |||
|
254 | $ cat foo | |||
|
255 | 2 |
General Comments 0
You need to be logged in to leave comments.
Login now