Mercurial > hg

comparison hgext/transplant.py @ 8076:5ec526c1a32f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help texts: write command line switches as -a/--abc
author Martin Geisler <mg@lazybytes.net>
date Sat, 18 Apr 2009 14:40:21 +0200
parents 83d7c9cfb065
children 6ee71f78497c
comparison
equal deleted inserted replaced
8075:1f0a5a5fff43 8076:5ec526c1a32f
440 440
441 You can rewrite the changelog message with the --filter option. 441 You can rewrite the changelog message with the --filter option.
442 Its argument will be invoked with the current changelog message as 442 Its argument will be invoked with the current changelog message as
443 $1 and the patch as $2. 443 $1 and the patch as $2.
444 444
445 If --source is specified, selects changesets from the named 445 If --source/-s is specified, selects changesets from the named
446 repository. If --branch is specified, selects changesets from the 446 repository. If --branch/-b is specified, selects changesets from
447 branch holding the named revision, up to that revision. If --all 447 the branch holding the named revision, up to that revision. If
448 is specified, all changesets on the branch will be transplanted, 448 --all/-a is specified, all changesets on the branch will be
449 otherwise you will be prompted to select the changesets you want. 449 transplanted, otherwise you will be prompted to select the
450 changesets you want.
450 451
451 hg transplant --branch REVISION --all will rebase the selected 452 hg transplant --branch REVISION --all will rebase the selected
452 branch (up to the named revision) onto your current working 453 branch (up to the named revision) onto your current working
453 directory. 454 directory.
454 455
460 If no merges or revisions are provided, hg transplant will start 461 If no merges or revisions are provided, hg transplant will start
461 an interactive changeset browser. 462 an interactive changeset browser.
462 463
463 If a changeset application fails, you can fix the merge by hand 464 If a changeset application fails, you can fix the merge by hand
464 and then resume where you left off by calling hg transplant 465 and then resume where you left off by calling hg transplant
465 --continue. 466 --continue/-c.
466 ''' 467 '''
467 def getremotechanges(repo, url): 468 def getremotechanges(repo, url):
468 sourcerepo = ui.expandpath(url) 469 sourcerepo = ui.expandpath(url)
469 source = hg.repository(ui, sourcerepo) 470 source = hg.repository(ui, sourcerepo)
470 common, incoming, rheads = repo.findcommonincoming(source, force=True) 471 common, incoming, rheads = repo.findcommonincoming(source, force=True)