D5496: revset: add "samebranch" keyword argument to the merge revset

mharbison72 (Matt Harbison) phabricator at mercurial-scm.org
Tue Jan 22 18:28:25 UTC 2019


mharbison72 added a comment.


  In https://phab.mercurial-scm.org/D5496#82908, @angel.ezquerra wrote:
  
  > In https://phab.mercurial-scm.org/D5496#82671, @yuja wrote:
  >
  > >
  >
  >
  > Do you mean that the flag should only indicate whether you want to hide the same branch merges? I guess that is OK too, since the main use case for this flag is to hide the merge from the same branch. However I think we should change the flag name then. Perhaps "hidesame"? Or "includesame" or "includeself", defaulting to True? Any ideas?
  
  
  Maybe `anonymous`, defaulting to True?  That's in the glossary under `Branch, anonymous`, so not technically a merge, but I think it still conveys the point.
  
  I think I have a similar reaction as Yuya, but in the opposite direction- `merge(anonymous=True)` makes me think that's all that's of interest.  So maybe `withanonymous`?
  
  I do like the compactness of:
  
    merge() => all merges
    merge(anonymous=True) => only merges with matching (p1, p2) branch names
    merge(anonymous=False) => only merges with different (p1, p2) branch names
  
  Otherwise finding only anonymous merges is something like `merge() - merge(anonymous=False)`, and it took some thinking to get there with the double negative.
  
  But I have no idea how well that applies to other things if we set that precedent here, and don't feel that strongly about it.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5496

To: angel.ezquerra, #hg-reviewers
Cc: mharbison72, yuja, mercurial-devel


More information about the Mercurial-devel mailing list