Adding comments to groups of changes?

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Mon Jun 30 13:16:26 CDT 2008


Arne, I like the idea very much. But I think, like with .hgtags
actually, it could surprise people when they have to merge this file.
Especially as the content is even more complicated that .hgtags. Maybe
we need a special internal merge for such files that only bails on
changes to the same line.

Also, couldn't you use the group's changelog entry to supply the
message? If you really want to amend a group's description, just put
it into a new group. Tools could then be made smart enough to hide an
intermediate inner group when one group wraps just a single other
group.

-parren

On Sat, Jun 28, 2008 at 2:37 AM, Arne Babenhauserheide <arne_bab at web.de> wrote:
> After discussing with piranha and others in #mercurial @ irc.freenode.net, I
> changed and implemented the concept.
>
> It is far from clean, and my sourcefiles have gathered quite a lot of working
> comments, but it works.
>
> added/changed commands:
>
> $ hg group rev1 rev2 rev3
>
> Gather the given revisions (as hex, number, and what else repo.changectx()
> takes ) into a group.
>
> $ hg groups
> show all groups in reversed chronological order.
>
> $ hg log
> hide all revisions which are in groups. Groups can be grouped, too.
>
>
> A group is just another commit associated with an entry in the .hggroups file
> (by repo.annotate()).
>
> .hggroups contains a short description of each group (for convenience, and for
> being able to rewrite group descriptions without changing the tracked
> revisions) and the tracked revisions.
> An example:
> "The 1st group" 333aaf680223486d5aa10a5ee5feb284151d8961
> 356e81704e4fdf9368ff07598c9c8fe28cab7e20
>
> (all on one line)
>
> To remove groups, you can just remove the lines from the .hggroups file and
> commit (there isn't yet a remove command). The group data in the commits will
> still exist, but since the group entries will be missing, they won't be
> associated with groups.
>
>
> "user" and "date" are taken directly from the associated commits.
>
> I attached a somewhat cleaned version of the files for review.
>
> My working repository with all private comment strings and worse artefacts is
> avaible at
> http://freehg.org/u/ArneBab/hgext_group/
>
>
> Please comment!
>
> Best wishes,
> Arne
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>


More information about the Mercurial mailing list