Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commit.py @ 46811:5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.
From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.
Differential Revision: https://phab.mercurial-scm.org/D10149
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 10 Mar 2021 13:14:32 +0530 |
| parents | e2f7b2695ba1 |
| children | d55b71393907 |
comparison
equal
deleted
inserted
replaced
| 46810:56d441256e82 | 46811:5a0b930cfb3e |
|---|---|
| 359 elif fparent1 == nullid: | 359 elif fparent1 == nullid: |
| 360 fparent1, fparent2 = fparent2, nullid | 360 fparent1, fparent2 = fparent2, nullid |
| 361 elif fparent2 != nullid: | 361 elif fparent2 != nullid: |
| 362 if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other': | 362 if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other': |
| 363 fparent1, fparent2 = fparent2, nullid | 363 fparent1, fparent2 = fparent2, nullid |
| 364 elif ms.active() and ms.extras(fname).get(b'merged') != b'yes': | |
| 365 fparent1, fparent2 = fparent1, nullid | |
| 364 # is one parent an ancestor of the other? | 366 # is one parent an ancestor of the other? |
| 365 else: | 367 else: |
| 366 fparentancestors = flog.commonancestorsheads(fparent1, fparent2) | 368 fparentancestors = flog.commonancestorsheads(fparent1, fparent2) |
| 367 if fparent1 in fparentancestors: | 369 if fparent1 in fparentancestors: |
| 368 fparent1, fparent2 = fparent2, nullid | 370 fparent1, fparent2 = fparent2, nullid |