##// END OF EJS Templates
transplant: wrapped docstrings at 78 characters
Martin Geisler -
r9076:3f505d4b default
parent child Browse files
Show More
@@ -9,8 +9,8 b''
9
9
10 This extension allows you to transplant patches from another branch.
10 This extension allows you to transplant patches from another branch.
11
11
12 Transplanted patches are recorded in .hg/transplant/transplants, as a
12 Transplanted patches are recorded in .hg/transplant/transplants, as a map from
13 map from a changeset hash to its hash in the source repository.
13 a changeset hash to its hash in the source repository.
14 '''
14 '''
15
15
16 from mercurial.i18n import _
16 from mercurial.i18n import _
@@ -437,37 +437,34 b' def transplant(ui, repo, *revs, **opts):'
437 '''transplant changesets from another branch
437 '''transplant changesets from another branch
438
438
439 Selected changesets will be applied on top of the current working
439 Selected changesets will be applied on top of the current working
440 directory with the log of the original changeset. If --log is
440 directory with the log of the original changeset. If --log is specified,
441 specified, log messages will have a comment appended of the form:
441 log messages will have a comment appended of the form:
442
442
443 (transplanted from CHANGESETHASH)
443 (transplanted from CHANGESETHASH)
444
444
445 You can rewrite the changelog message with the --filter option.
445 You can rewrite the changelog message with the --filter option. Its
446 Its argument will be invoked with the current changelog message as
446 argument will be invoked with the current changelog message as $1 and the
447 $1 and the patch as $2.
447 patch as $2.
448
448
449 If --source/-s is specified, selects changesets from the named
449 If --source/-s is specified, selects changesets from the named repository.
450 repository. If --branch/-b is specified, selects changesets from
450 If --branch/-b is specified, selects changesets from the branch holding
451 the branch holding the named revision, up to that revision. If
451 the named revision, up to that revision. If --all/-a is specified, all
452 --all/-a is specified, all changesets on the branch will be
452 changesets on the branch will be transplanted, otherwise you will be
453 transplanted, otherwise you will be prompted to select the
453 prompted to select the changesets you want.
454 changesets you want.
455
454
456 hg transplant --branch REVISION --all will rebase the selected
455 hg transplant --branch REVISION --all will rebase the selected branch (up
457 branch (up to the named revision) onto your current working
456 to the named revision) onto your current working directory.
458 directory.
459
457
460 You can optionally mark selected transplanted changesets as merge
458 You can optionally mark selected transplanted changesets as merge
461 changesets. You will not be prompted to transplant any ancestors
459 changesets. You will not be prompted to transplant any ancestors of a
462 of a merged transplant, and you can merge descendants of them
460 merged transplant, and you can merge descendants of them normally instead
463 normally instead of transplanting them.
461 of transplanting them.
464
462
465 If no merges or revisions are provided, hg transplant will start
463 If no merges or revisions are provided, hg transplant will start an
466 an interactive changeset browser.
464 interactive changeset browser.
467
465
468 If a changeset application fails, you can fix the merge by hand
466 If a changeset application fails, you can fix the merge by hand and then
469 and then resume where you left off by calling hg transplant
467 resume where you left off by calling hg transplant --continue/-c.
470 --continue/-c.
471 '''
468 '''
472 def getremotechanges(repo, url):
469 def getremotechanges(repo, url):
473 sourcerepo = ui.expandpath(url)
470 sourcerepo = ui.expandpath(url)
General Comments 0
You need to be logged in to leave comments. Login now