comparison mercurial/commands.py @ 24661:8cf70c97a6e1

bookmarks: show detailed status about outgoing bookmarks Before this patch, "hg outgoing -B" shows only difference of bookmarks between two repositories, and it isn't user friendly. This patch shows detailed status about outgoing bookmarks at "hg outgoing -B". To avoid breaking backward compatibility with other tool chains, this patch shows status, only if --verbose is specified,
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 08 Apr 2015 02:56:19 +0900
parents bf13b44bbb0a
children 7d01371e6358
comparison
equal deleted inserted replaced
24660:bf13b44bbb0a 24661:8cf70c97a6e1
4792 Show changesets not found in the specified destination repository 4792 Show changesets not found in the specified destination repository
4793 or the default push location. These are the changesets that would 4793 or the default push location. These are the changesets that would
4794 be pushed if a push was requested. 4794 be pushed if a push was requested.
4795 4795
4796 See pull for details of valid destination formats. 4796 See pull for details of valid destination formats.
4797
4798 .. container:: verbose
4799
4800 With -B/--bookmarks, the result of bookmark comparison between
4801 local and remote repositories is displayed. With -v/--verbose,
4802 status is also displayed for each bookmark like below::
4803
4804 BM1 01234567890a added
4805 BM2 deleted
4806 BM3 234567890abc advanced
4807 BM4 34567890abcd diverged
4808 BM5 4567890abcde changed
4809
4810 The action taken when pushing depends on the
4811 status of each bookmark:
4812
4813 :``added``: push with ``-B`` will create it
4814 :``deleted``: push with ``-B`` will delete it
4815 :``advanced``: push will update it
4816 :``diverged``: push with ``-B`` will update it
4817 :``changed``: push with ``-B`` will update it
4818
4819 From the point of view of pushing behavior, bookmarks
4820 existing only in the remote repository are treated as
4821 ``deleted``, even if it is in fact added remotely.
4797 4822
4798 Returns 0 if there are outgoing changes, 1 otherwise. 4823 Returns 0 if there are outgoing changes, 1 otherwise.
4799 """ 4824 """
4800 if opts.get('graph'): 4825 if opts.get('graph'):
4801 cmdutil.checkunsupportedgraphflags([], opts) 4826 cmdutil.checkunsupportedgraphflags([], opts)