equal
deleted
inserted
replaced
248 raiseRequest |
248 raiseRequest |
249 ]. |
249 ]. |
250 ]. |
250 ]. |
251 ]. |
251 ]. |
252 |
252 |
253 ^ (HGCommand commit) |
253 ^self repository execute: |
254 workingDirectory:root pathName; |
254 (HGCommand commit |
255 message:message; |
255 workingDirectory:root pathName; |
256 files:files; |
256 message:message; |
257 author: author; |
257 files:files; |
258 date: dateSpecOrNil; |
258 author: author; |
259 executeOnRepository: self repository |
259 date: dateSpecOrNil; |
|
260 yourself). |
260 |
261 |
261 "Created: / 01-02-2013 / 14:28:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
262 "Created: / 01-02-2013 / 14:28:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
262 "Modified: / 03-03-2013 / 20:38:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
263 "Modified: / 03-03-2013 / 22:58:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
263 ! |
264 ! |
264 |
265 |
265 commit:message files:files date: dateSpecOrNil |
266 commit:message files:files date: dateSpecOrNil |
266 "Commit given files with given message and author. If files |
267 "Commit given files with given message and author. If files |
267 is nil, all tracked modified files are commited" |
268 is nil, all tracked modified files are commited" |
272 ! |
273 ! |
273 |
274 |
274 merge: aChangesetOrChangesetId |
275 merge: aChangesetOrChangesetId |
275 "Merge given changeset into workinf copy." |
276 "Merge given changeset into workinf copy." |
276 |
277 |
277 ^HGCommand merge |
278 ^self repository execute: |
278 workingDirectory: self path; |
279 (HGCommand merge |
279 revision: aChangesetOrChangesetId asHGChangesetId asString; |
280 workingDirectory: self path; |
280 tool: 'internal:dump'; |
281 revision: aChangesetOrChangesetId asHGChangesetId asString; |
281 executeOnRepository: self repository |
282 tool: 'internal:dump'; |
|
283 yourself) |
282 |
284 |
283 "Created: / 14-01-2013 / 15:14:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
285 "Created: / 14-01-2013 / 15:14:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
284 "Modified: / 03-03-2013 / 20:38:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
286 "Modified: / 03-03-2013 / 22:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
285 ! |
287 ! |
286 |
288 |
287 update |
289 update |
288 "Update the working copy to the latest rev in current branch" |
290 "Update the working copy to the latest rev in current branch" |
289 |
291 |
294 |
296 |
295 update: revisionOrBranch |
297 update: revisionOrBranch |
296 |
298 |
297 self changeset id = revisionOrBranch ifTrue:[ ^ self ]. |
299 self changeset id = revisionOrBranch ifTrue:[ ^ self ]. |
298 |
300 |
299 ^HGCommand update |
301 ^self repository execute: |
300 workingDirectory: self path; |
302 (HGCommand update |
301 revision: revisionOrBranch asString; |
303 workingDirectory: self path; |
302 executeOnRepository: self repository |
304 revision: revisionOrBranch asString; |
|
305 yourself) |
303 |
306 |
304 "Created: / 21-11-2012 / 00:21:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
307 "Created: / 21-11-2012 / 00:21:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
305 "Modified: / 03-03-2013 / 20:39:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
308 "Modified: / 03-03-2013 / 23:00:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
306 ! ! |
309 ! ! |
307 |
310 |
308 !HGWorkingCopy methodsFor:'initialization'! |
311 !HGWorkingCopy methodsFor:'initialization'! |
309 |
312 |
310 setRepository: aHGRepository |
313 setRepository: aHGRepository |
371 |
374 |
372 !HGWorkingCopy::MergeState methodsFor:'private'! |
375 !HGWorkingCopy::MergeState methodsFor:'private'! |
373 |
376 |
374 states |
377 states |
375 states isNil ifTrue:[ |
378 states isNil ifTrue:[ |
376 states := HGCommand resolve__list |
379 states := wc repository execute: |
377 workingDirectory: wc pathName; |
380 (HGCommand resolve__list |
378 executeOnRepository: wc repository. |
381 workingDirectory: wc pathName; |
|
382 yourself) . |
379 ]. |
383 ]. |
380 ^states |
384 ^states |
381 |
385 |
382 "Created: / 14-01-2013 / 16:47:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
386 "Created: / 14-01-2013 / 16:47:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
383 "Modified: / 03-03-2013 / 20:39:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
387 "Modified: / 03-03-2013 / 23:00:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
384 ! ! |
388 ! ! |
385 |
389 |
386 !HGWorkingCopy class methodsFor:'documentation'! |
390 !HGWorkingCopy class methodsFor:'documentation'! |
387 |
391 |
388 version_HG |
392 version_HG |