This revision now requires changes to proceed.
baymax added a comment.
baymax requested changes to this revision.
There seems to have been no activities on this Diff for the past 3 Months.
By policy, we are automatically moving it out of the `need-review` state.
Please, move it back
Thank you Matt. I just did that.
Cheers,
Angel
On Wed, Jan 16, 2019 at 7:01 AM mharbison72 (Matt Harbison)
wrote:
>
> mharbison72 added a comment.
>
>
> In https://phab.mercurial-scm.org/D5495#82416, @angel.ezquerra wrote:
>
> > I've sent an updated set of patches, following your
mharbison72 added a comment.
In https://phab.mercurial-scm.org/D5495#82416, @angel.ezquerra wrote:
> I've sent an updated set of patches, following your recommendations. There
are 2 patches now, since each includes its own tests. This means that the 3rd
patch on the original patch set
angel.ezquerra added a comment.
In https://phab.mercurial-scm.org/D5495#82397, @yuja wrote:
> Generally looks good.
>
> Can you fix a couple of nits? And if possible, fold the tests from
https://phab.mercurial-scm.org/D5577
> into this and the next patch. We prefer including
angel.ezquerra updated this revision to Diff 13210.
Herald added a subscriber: mjpieters.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5495?vs=13204=13210
REVISION DETAIL
https://phab.mercurial-scm.org/D5495
AFFECTED FILES
mercurial/revset.py
yuja added a comment.
> What about making the argument a revset instead of a branch name. You can
get the same result `merge(branch("foo")` but have a more expressive result
`merge(only(4.8, 4.7))` ?
That's basically a simpler form of my `filter()` proposal.
The problem of
> What about making the argument a revset instead of a branch name. You can
> get the same result `merge(branch("foo")` but have a more expressive result
> `merge(only(4.8, 4.7))` ?
That's basically a simpler form of my `filter()` proposal.
The problem of `merge(branch("foo"))` is that it's
lothiraldan added a comment.
What about making the argument a revset instead of a branch name. You can get
the same result `merge(branch("foo")` but have a more expressive result
`merge(only(4.8, 4.7))` ?
(Sorry to be a bit late to the party)
REPOSITORY
rHG Mercurial
REVISION DETAIL
yuja added a comment.
Generally looks good.
Can you fix a couple of nits? And if possible, fold the tests from
https://phab.mercurial-scm.org/D5577
into this and the next patch. We prefer including relevant test in each
commit.
> -@predicate('merge()', safe=True)
>
Generally looks good.
Can you fix a couple of nits? And if possible, fold the tests from D5577
into this and the next patch. We prefer including relevant test in each
commit.
> -@predicate('merge()', safe=True)
> +@predicate('merge(withbranch)', safe=True)
`merge([withbranch])` as it is an
angel.ezquerra updated this revision to Diff 13204.
angel.ezquerra edited the summary of this revision.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5495?vs=13017=13204
REVISION DETAIL
https://phab.mercurial-scm.org/D5495
AFFECTED FILES
yuja added a comment.
> This would not make it possible to select multiple "merged with" branches
by doing: hg log -r "merge(feature1, feature2)"
> Instead I guess you are proposing that for that use case we force the
user to do: hg log -r "merge('re:(feature1|feature2)')
>
>
> This would not make it possible to select multiple "merged with" branches
> by doing: hg log -r "merge(feature1, feature2)"
> Instead I guess you are proposing that for that use case we force the user
> to do: hg log -r "merge('re:(feature1|feature2)')
>
> Did I understand you
angel.ezquerra added a comment.
In https://phab.mercurial-scm.org/D5495#82036, @yuja wrote:
> > I think it would be a good idea to make the "branch" arguments more
flexible. One option could be to use a stringmatcher to add support for regular
expressions as you suggest. I can look
yuja added a comment.
> I think it would be a good idea to make the "branch" arguments more
flexible. One option could be to use a stringmatcher to add support for regular
expressions as you suggest. I can look into that. However there may be some
other options worth exploring. The one
> I think it would be a good idea to make the "branch" arguments more
> flexible. One option could be to use a stringmatcher to add support for
> regular expressions as you suggest. I can look into that. However there may
> be some other options worth exploring. The one you suggest is very
>
angel.ezquerra added a comment.
In https://phab.mercurial-scm.org/D5495#81562, @yuja wrote:
> > +@predicate('merge(*withbranch)', safe=True)
> >
> > def merge(repo, subset, x):
> >
> > - """Changeset is a merge changeset. +"""Changeset is a merge
changeset + +All
pulkit added a comment.
In https://phab.mercurial-scm.org/D5495#81562, @yuja wrote:
> > +@predicate('merge(*withbranch)', safe=True)
> >
> > def merge(repo, subset, x):
> >
> > - """Changeset is a merge changeset. +"""Changeset is a merge
changeset + +All merge
yuja added a comment.
> +@predicate('merge(*withbranch)', safe=True)
>
> def merge(repo, subset, x):
>
> - """Changeset is a merge changeset. +"""Changeset is a merge changeset
+ +All merge revisions are returned by default. If one or more "withbranch"
+names are
> +@predicate('merge(*withbranch)', safe=True)
> def merge(repo, subset, x):
> -"""Changeset is a merge changeset.
> +"""Changeset is a merge changeset
> +
> +All merge revisions are returned by default. If one or more "withbranch"
> +names are provided only merges with those
angel.ezquerra created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Make it possible to only include those merge revisions that are merges with
one
or more specific branches (passed as positional arguments to the merge
21 matches
Mail list logo
