Add an option to the command 'hg log' in order to show merges only

[Matt Mackall]

On Fri, Jul 01, 2005 at 08:09:28PM +0200, Goffredo Baroncelli wrote:
> Hi,
> 
> the patch below add an option ( -m ) to the command 'hg log' in order to show merges only;
> 
> Matt, in your TODO you say that a merge have two parents or parent != changeset-1; ok
> for the first clauses, but parent != changeset-1 happens also in a pull from 
> another repository; so my patch checks only the number of parents.

You're right. That confusion came from TAH.
> 
> examples:
> 
> $ python hg log | head -20
> changeset:   559:bf9d55ed67f6e43b880c00b775964b59449ff952
> tag:         tip
> user:        mpm at selenic.com
> date:        Fri Jul  1 19:04:50 2005
> summary:     [PATCH] hg clone stored path fix
> 
> changeset:   558:0ceea19182a9da6ed9f25e13207e58a7c0b55420
> user:        mpm at selenic.com
> date:        Fri Jul  1 19:01:07 2005
> summary:     transaction: __del__ should do nothing if the journal already exists
> 
> changeset:   557:b9fee419a1bdbb8edae6982d49172344067897ec
> user:        mpm at selenic.com
> date:        Fri Jul  1 18:54:52 2005
> summary:     recover: the journal is named 'journal'
> 
> changeset:   556:f6c6fa15ff706c79d77b47baacfb7e4fafd1a22e
> user:        mpm at selenic.com
> date:        Fri Jul  1 10:34:50 2005
> summary:     Move dirstate.uniq to util.unique
> close failed: [Errno 32] Broken pipe
> $ hg log -m | head -20
> changeset:   553:f2442a6a589355e6c29b01882acaa8e439611ee0
> parent:      551:b460a2fd8bb7855348fafb861cd22de1616d331e
> parent:      552:2204311609a08017171372e6be13304222dccaa1
> user:        mpm at selenic.com
> date:        Fri Jul  1 10:10:52 2005
> summary:     Merge with TAH
> 
> changeset:   547:4fc63e22b1fe707bb542ab1149403daa9a77cdf8
> parent:      540:53872e2be33a09350ee57384574f9fcab78f1b41
> parent:      546:c8ae964109c1eb09a17a9f6e478f48571101dac0
> user:        mpm at selenic.com
> date:        Fri Jul  1 09:28:16 2005
> summary:     Merge with TAH
> 
> changeset:   542:eda4c32c167af7dc718b6ab1bb8d2555f1d2e5c2
> parent:      541:abaea35387a81b39dbb0532328a12508644dfb0b
> parent:      535:fba26990604a48dcea3506399409145aed3b7dc8
> user:        Thomas Arendsen Hein <thomas at intevation.de>
> date:        Thu Jun 30 22:47:23 2005
> summary:     Merge with upstream
> 
> 
> Goffredo

I think it'd be more interesting to have a switch that did the
opposite. Merges are generally content-free. Can you add that to your
patch? Perhaps -M?

-- 
Mathematics is the supreme nostalgia of our time.