Dennis Brakhane | 1 Feb 10:14
Gravatar

Re: Grouping commits before pushing

Am 29.01.2012 21:33, schrieb Luiz Guilherme:
> I just didn't figure out yet if there is a more direct way to qfold a
> list of patches. If I have 10 patches before commiting, it would be
> annoying to list all of them, does anybody know how? Anyways, if you
> have any suggestion please give it to us.

If you are on Unix (Linux/Mac OS), you can simply use

  hg qfold $(hg qunapplied)

to do this.

HTH,
   Dennis
--

-- 
Dennis Brakhane, Martin Grotzke und Ole Langbehn GbR
Breitenfelder Str. 13c, 20251 Hamburg

Jason Harris | 1 Feb 11:19
Gravatar

Re: Grouping commits before pushing


On Feb 1, 2012, at 10:14 AM, Dennis Brakhane wrote:

> Am 29.01.2012 21:33, schrieb Luiz Guilherme:
>> I just didn't figure out yet if there is a more direct way to qfold a
>> list of patches. If I have 10 patches before commiting, it would be
>> annoying to list all of them, does anybody know how? Anyways, if you
>> have any suggestion please give it to us.
> 
> If you are on Unix (Linux/Mac OS), you can simply use

Well if you are on OSX then probably the simplest by far is to use a GUI client
like MacHg where you just select the range of commits to collapse and then
choose the menu item Repository > Collapse Changesets...

Or use the interface to the histedit extension via Repository > Edit Changesets...

Cheers,
   Jason

>  hg qfold $(hg qunapplied)
> 
> to do this.
> 
> 
> HTH,
>   Dennis
> -- 
> Dennis Brakhane, Martin Grotzke und Ole Langbehn GbR
> Breitenfelder Str. 13c, 20251 Hamburg
(Continue reading)

Robin Pellatt | 1 Feb 12:51
Picon

Re: Re-establish file history after rename post push?

On 27 January 2012 03:42, Kevin Bullock <kbullock+mercurial <at> ringworld.org> wrote:
On 26 Jan 2012, at 4:26 PM, Haszlakiewicz, Eric wrote:

-----Original Message-----
From: mercurial-bounces <at> selenic.com [mailto:mercurial-

I renamed/moved some file without using hg rename or visualhg, so the
file history is not available referencing the new filename.  I know
what I did wrong, but was wondering if there is a command that would
re-establish this file history post push?

Now there are new changes on the files that Mercurial thinks are new,
so merging is more complicated!

Maybe try:
1) update your working directory to before you did the rename
2) do an actual "hg rename" which will create a new head
3) merge that new head into the revision where you did the "manual" rename (not the head revision!)
4) Then finally merge the head revision into this merge result.

However, I haven't ever tried anything like that, so be sure to check that this does something reasonable before pushing any changed out of a temporary working clone. :)

I just did a quick test of this with a trivial repo (hg init foo && cd foo && echo a>>a && hg ci -Am0; etc.), and it does indeed seem to work. Merging another branch that modifies the original file does end up merging the changes into the renamed file.

I think this merits an entry on the TipsAndTricks page on the wiki.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock


_______________________________________________
Mercurial mailing list
Mercurial <at> selenic.com
http://selenic.com/mailman/listinfo/mercurial

This was very well timed, I just did exactly the same thing myself.  I can confirm the method given above works perfectly.  I've also taken the liberty of following up Kevin's suggestion, so it is now item 36 in the TipsAndTricks page.
Cheers,
Robin
Matt Mackall | 1 Feb 22:20
Favicon

Mercurial 2.1 released!

This is a regularly-scheduled feature release. The major new feature in
this release is support for changeset phases, described here:

http://mercurial.selenic.com/wiki/Phases

Huge thanks to Pierre-Yves David and Logilab for their work on this
feature.

Full release details here:

http://mercurial.selenic.com/wiki/WhatsNew

Available for download at:

http://mercurial.selenic.com/release/mercurial-2.1.tar.gz

Binaries releases to follow shortly.

Many thanks to everyone who contributed! New contributors this release
include:

Alain Leufroy
Andrei Polushin
David M. Carr
Dmitry Panov
Ion Savin
Jesus Espino Garcia
Laurens Holst
Levi Bard
Marc-Antoine Ruel
Markus Zapke-Gründemann
Martin Schröder
Matt Zuba
Michal Sznajder
Nicolas Venegas
Nikolaus Schueler
Olav Reinert
Thomas De Schampheleire

--

-- 
Mathematics is the supreme nostalgia of our time.

_______________________________________________
Mercurial mailing list
Mercurial <at> selenic.com
http://selenic.com/mailman/listinfo/mercurial
Dennis Brakhane | 2 Feb 00:04
Gravatar

Re: Mercurial 2.1 released!

On Wed, Feb 1, 2012 at 10:20 PM, Matt Mackall <mpm <at> selenic.com> wrote:
> This is a regularly-scheduled feature release. The major new feature in
> this release is support for changeset phases, described here:
>
> http://mercurial.selenic.com/wiki/Phases

The Wiki page includes the following sentence when describing secret
changesets:

"Secret changesets are hidden from remote peers and will not be
included in push operations."

I think I remember from the bideshedding "phase names" discussion that
secret changesets are more like private
changesets - if someone really wants them, he can get learn about
them, they are not secret per se.

Given that people already associate "secret" with something that noone
else can see, I find the above statement
particularly problematic as it reinforces this misconception.

I would have added a clarifying sentence, but I'm not 100% sure I
didn't miss on some recent changes that actually
make secret changesets secret, which is why I wanted to note it first.
Stephen Rasku | 2 Feb 00:17

Re: Mercurial 2.1 released!

On Wed, Feb 1, 2012 at 15:04, Dennis Brakhane <brakhane <at> googlemail.com> wrote:
On Wed, Feb 1, 2012 at 10:20 PM, Matt Mackall <mpm <at> selenic.com> wrote:
> This is a regularly-scheduled feature release. The major new feature in
> this release is support for changeset phases, described here:
>
> http://mercurial.selenic.com/wiki/Phases

There's this sentence fragment on the wiki.  

A changeset is not expected to automatically move from a lower phase to an higher phase (eg: from public to draft) but automatic

I did not participate in the development discussions so I don't know what this is supposed to mean.  Can someone explain or correct it on the wiki?

...Stephen
Picon
Gravatar

Re: Mercurial 2.1 released!

Am Mittwoch, 1. Februar 2012, 15:17:52 schrieb Stephen Rasku:
> On Wed, Feb 1, 2012 at 15:04, Dennis Brakhane 
<brakhane <at> googlemail.com>wrote:
> > On Wed, Feb 1, 2012 at 10:20 PM, Matt Mackall <mpm <at> selenic.com> wrote:
> > > This is a regularly-scheduled feature release. The major new feature in
> > > this release is support for changeset phases, described here:
> > > 
> > > http://mercurial.selenic.com/wiki/Phases
> 
> There's this sentence fragment on the wiki.
> 
> A changeset is not expected to automatically move from a lower phase to an
> higher phase (eg: from *public* to *draft*) but automatic
> 
> I did not participate in the development discussions so I don't know what
> this is supposed to mean.  Can someone explain or correct it on the wiki?

Adapted. I hope it is correct:

A changeset is not expected to automatically move from a lower phase to an 
higher phase (eg: from public to draft) but automatic movement from draft to 
public can happen on transferring changesets between clones. Secret changesets 
have to be moved explicitely (except for bundles specified with the --base 
option).

Best wishes,
Arne
Picon
Gravatar

Re: Mercurial 2.1 released!

Am Donnerstag, 2. Februar 2012, 00:04:29 schrieb Dennis Brakhane:
>> http://mercurial.selenic.com/wiki/Phases
> I think I remember from the bideshedding "phase names" discussion that
> secret changesets are more like private
> changesets - if someone really wants them, he can get learn about
> them, they are not secret per se.

Well, since it is now named secret, people will expect real secrecy. So to 
fullfill that expectation, we might need real security, including clean 
information seperation.

I opted for other names, too, but I guess released is released.

Best wishes,
Arne

Andrey Somov | 2 Feb 10:47
Picon

CommandServer library for Scala is available

Hi all,

I am glad to announce a CommandServer library for Scala.

The license is Apache 2.0

The project is hosted at the moment at Google code:

Goals: 
 * support Scala developers 
 * maintain in parallel a pure Java API with examples
 * no external dependencies except for Scala library
 * maintain high test coverage (at the moment all the tests for python-hglib pass)
 * support IDE developers if they decide to use Meutrino
 * contribute to python-hglib and Mercurial

Any feedback is welcome !

Regards,
Andrey
Martin Geisler | 2 Feb 11:29
Favicon
Gravatar

Re: CommandServer library for Scala is available

Andrey Somov <py4fun <at> gmail.com> writes:

> Hi all,
> I am glad to announce a CommandServer library for Scala.
>
> The license is Apache 2.0
>
> The project is hosted at the moment at Google code:
> http://code.google.com/p/meutrino/
>
> Goals:
>  * support Scala developers
>  * maintain in parallel a pure Java API with examples
>  * no external dependencies except for Scala library
>  * maintain high test coverage (at the moment all the tests for
> python-hglib pass)
>  * support IDE developers if they decide to use Meutrino
>  * contribute to python-hglib and Mercurial
>
> Any feedback is welcome !

Great to see more command server libraries! Have you thought of how this
can use or play together with JavaHg?

  http://javahg.org/

Since Scala programs can call into Java directly, it's a shame to
reinvent the wheel by writing all the parsing code twice. Of course, if
you don't like the JavaHg API, then I can understand making your own :)
But in that case, Jan and I would be interested in hearing any feedback
you have.

--

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://www.aragost.com/mercurial/customer-projects/

Gmane