[PATCH 2 of 2] bookmarks: show details of difference between local and remote bookmarks
laurens.nospam at grauw.nl
Mon Sep 24 05:32:27 CDT 2012
Op 22-09-12 07:56, FUJIWARA Katsunori schreef:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1348293230 -32400
> # Node ID fb900c89f96b209486068ef2cdb4b9af43db1de6
> # Parent 750be2c38db4e86c3f09d0cae83e9af9d49795e7
> bookmarks: show details of difference between local and remote bookmarks
> Before this patch, "hg incoming"/"hg outgoing" with -B show only
> bookmarks newly added on the source repository.
> So, users can't know whether "hg push"/"hg pull" cause divergence or
> overwriting of specific bookmark or not, before execution of them.
> This patch shows not only newly added bookmarks, but also details of
> difference between local and remote bookmarks.
> For local bookmarks which are different from ones on remote, details
> of them are decided as below: each of "b at local" and "b at remote" are
> assumed to mean revisions referred by bookmarks on each sides.
> - if "b at remote" is contained in the local:
> - if "b at local" and "b at remote" are diverged, show as "(diverged)"
> - if "b at local" < "b at remote", show as "(advanced on the remote)"
> - otherwise("b at remoet" < "b at local"), show as "(advanced on the local)"
> - otherwise:
> - show as "(different from the remote)", because "b at local" is
> different from "b at remote", but divergence of them can't be
> examined with low cost
Phrasing nit, you should leave out “the” in these sentences:
- (advanced on remote)
- (advanced on local)
- (different from remote)
Some other suggestions:
- (advanced remotely)
- (remote advanced)
- (advanced locally)
- (local advanced)
- (remote changed)
- (remote diverged)
I guess which is best depends on what the common phrasing style is in
Mercurial or Linux.
More information about the Mercurial-devel