Patchwork [5,of,5] merge.mergestate: expose branch merge info via a method

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 3, 2015, 6:23 a.m.
Message ID <d9413cf14bb6ce9c6abc.1446531814@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11272/
State Changes Requested
Headers show

Comments

Siddharth Agarwal - Nov. 3, 2015, 6:23 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1446520194 28800
#      Mon Nov 02 19:09:54 2015 -0800
# Node ID d9413cf14bb6ce9c6abcde766e3e73893702c0d1
# Parent  61c764167bb79d23f6798a2d8352be38a5833770
merge.mergestate: expose branch merge info via a method

This will be used by upcoming patches that need to use this for change/delete
situations.
Sean Farley - Nov. 3, 2015, 6:34 a.m.
Siddharth Agarwal <sid0@fb.com> writes:

> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1446520194 28800
> #      Mon Nov 02 19:09:54 2015 -0800
> # Node ID d9413cf14bb6ce9c6abcde766e3e73893702c0d1
> # Parent  61c764167bb79d23f6798a2d8352be38a5833770
> merge.mergestate: expose branch merge info via a method
>
> This will be used by upcoming patches that need to use this for change/delete
> situations.

Nice, these look good.
Martin von Zweigbergk - Nov. 3, 2015, 10:03 p.m.
I'm also taking a look at these patches. I worked on this many months back,
so I'll compare to my unfinished patches from back then.

On Mon, Nov 2, 2015 at 10:35 PM Sean Farley <sean@farley.io> wrote:

>
> Siddharth Agarwal <sid0@fb.com> writes:
>
> > # HG changeset patch
> > # User Siddharth Agarwal <sid0@fb.com>
> > # Date 1446520194 28800
> > #      Mon Nov 02 19:09:54 2015 -0800
> > # Node ID d9413cf14bb6ce9c6abcde766e3e73893702c0d1
> > # Parent  61c764167bb79d23f6798a2d8352be38a5833770
> > merge.mergestate: expose branch merge info via a method
> >
> > This will be used by upcoming patches that need to use this for
> change/delete
> > situations.
>
> Nice, these look good.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -256,6 +256,9 @@  class mergestate(object):
     def otherctx(self):
         return self._repo[self._other]
 
+    def branchmerge(self):
+        return self._branchmerge
+
     def active(self):
         """Whether mergestate is active.