Show More
@@ -456,16 +456,20 b' def incoming(ui, repo, other):' | |||||
456 | getid = lambda id: id |
|
456 | getid = lambda id: id | |
457 | else: |
|
457 | else: | |
458 | getid = lambda id: id[:12] |
|
458 | getid = lambda id: id[:12] | |
459 | def add(b, id): |
|
459 | if ui.verbose: | |
460 | incomings.append(" %-25s %s\n" % (b, getid(id))) |
|
460 | def add(b, id, st): | |
|
461 | incomings.append(" %-25s %s %s\n" % (b, getid(id), st)) | |||
|
462 | else: | |||
|
463 | def add(b, id, st): | |||
|
464 | incomings.append(" %-25s %s\n" % (b, getid(id))) | |||
461 | for b, scid, dcid in addsrc: |
|
465 | for b, scid, dcid in addsrc: | |
462 | add(b, scid) |
|
466 | add(b, scid, _('added')) | |
463 | for b, scid, dcid in advsrc: |
|
467 | for b, scid, dcid in advsrc: | |
464 | add(b, scid) |
|
468 | add(b, scid, _('advanced')) | |
465 | for b, scid, dcid in diverge: |
|
469 | for b, scid, dcid in diverge: | |
466 | add(b, scid) |
|
470 | add(b, scid, _('diverged')) | |
467 | for b, scid, dcid in differ: |
|
471 | for b, scid, dcid in differ: | |
468 | add(b, scid) |
|
472 | add(b, scid, _('changed')) | |
469 |
|
473 | |||
470 | if not incomings: |
|
474 | if not incomings: | |
471 | ui.status(_("no changed bookmarks found\n")) |
|
475 | ui.status(_("no changed bookmarks found\n")) |
@@ -4300,6 +4300,29 b' def incoming(ui, repo, source="default",' | |||||
4300 |
|
4300 | |||
4301 | .. container:: verbose |
|
4301 | .. container:: verbose | |
4302 |
|
4302 | |||
|
4303 | With -B/--bookmarks, the result of bookmark comparison between | |||
|
4304 | local and remote repositories is displayed. With -v/--verbose, | |||
|
4305 | status is also displayed for each bookmark like below:: | |||
|
4306 | ||||
|
4307 | BM1 01234567890a added | |||
|
4308 | BM2 1234567890ab advanced | |||
|
4309 | BM3 234567890abc diverged | |||
|
4310 | BM4 34567890abcd changed | |||
|
4311 | ||||
|
4312 | The action taken locally when pulling depends on the | |||
|
4313 | status of each bookmark: | |||
|
4314 | ||||
|
4315 | :``added``: pull will create it | |||
|
4316 | :``advanced``: pull will update it | |||
|
4317 | :``diverged``: pull will create a divergent bookmark | |||
|
4318 | :``changed``: result depends on remote changesets | |||
|
4319 | ||||
|
4320 | From the point of view of pulling behavior, bookmark | |||
|
4321 | existing only in the remote repository are treated as ``added``, | |||
|
4322 | even if it is in fact locally deleted. | |||
|
4323 | ||||
|
4324 | .. container:: verbose | |||
|
4325 | ||||
4303 | For remote repository, using --bundle avoids downloading the |
|
4326 | For remote repository, using --bundle avoids downloading the | |
4304 | changesets twice if the incoming is followed by a pull. |
|
4327 | changesets twice if the incoming is followed by a pull. | |
4305 |
|
4328 |
@@ -526,11 +526,11 b' be excahnged)' | |||||
526 | $ hg -R repo1 incoming -B repo2 -v |
|
526 | $ hg -R repo1 incoming -B repo2 -v | |
527 | comparing with repo2 |
|
527 | comparing with repo2 | |
528 | searching for changed bookmarks |
|
528 | searching for changed bookmarks | |
529 | ADD_ON_REPO2 66f7d451a68b |
|
529 | ADD_ON_REPO2 66f7d451a68b added | |
530 | ADV_ON_REPO2 66f7d451a68b |
|
530 | ADV_ON_REPO2 66f7d451a68b advanced | |
531 | DIFF_ADV_ON_REPO2 e7bd5218ca15 |
|
531 | DIFF_ADV_ON_REPO2 e7bd5218ca15 changed | |
532 | DIFF_DIVERGED e7bd5218ca15 |
|
532 | DIFF_DIVERGED e7bd5218ca15 changed | |
533 | DIVERGED fa942426a6fd |
|
533 | DIVERGED fa942426a6fd diverged | |
534 | $ hg -R repo1 outgoing -B repo2 -v |
|
534 | $ hg -R repo1 outgoing -B repo2 -v | |
535 | comparing with repo2 |
|
535 | comparing with repo2 | |
536 | searching for changed bookmarks |
|
536 | searching for changed bookmarks | |
@@ -545,11 +545,11 b' be excahnged)' | |||||
545 | $ hg -R repo2 incoming -B repo1 -v |
|
545 | $ hg -R repo2 incoming -B repo1 -v | |
546 | comparing with repo1 |
|
546 | comparing with repo1 | |
547 | searching for changed bookmarks |
|
547 | searching for changed bookmarks | |
548 | ADD_ON_REPO1 66f7d451a68b |
|
548 | ADD_ON_REPO1 66f7d451a68b added | |
549 | ADV_ON_REPO1 fa942426a6fd |
|
549 | ADV_ON_REPO1 fa942426a6fd advanced | |
550 | DIFF_ADV_ON_REPO1 6100d3090acf |
|
550 | DIFF_ADV_ON_REPO1 6100d3090acf changed | |
551 | DIFF_DIVERGED 6100d3090acf |
|
551 | DIFF_DIVERGED 6100d3090acf changed | |
552 | DIVERGED 66f7d451a68b |
|
552 | DIVERGED 66f7d451a68b diverged | |
553 | $ hg -R repo2 outgoing -B repo1 -v |
|
553 | $ hg -R repo2 outgoing -B repo1 -v | |
554 | comparing with repo1 |
|
554 | comparing with repo1 | |
555 | searching for changed bookmarks |
|
555 | searching for changed bookmarks |
General Comments 0
You need to be logged in to leave comments.
Login now