| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| % f | % f | ||||
| ) | ) | ||||
| for nf in sorted(fl): | for nf in sorted(fl): | ||||
| repo.ui.warn(b" %s\n" % nf) | repo.ui.warn(b" %s\n" % nf) | ||||
| ### apply phase | ### apply phase | ||||
| if not branchmerge: # just jump to the new rev | if not branchmerge: # just jump to the new rev | ||||
| fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b'' | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b'' | ||||
| if not partial and not wc.isinmemory(): | updatedirstate = not partial and not wc.isinmemory() | ||||
| if updatedirstate: | |||||
| repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) | repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) | ||||
| # note that we're in the middle of an update | # note that we're in the middle of an update | ||||
| repo.vfs.write(b'updatestate', p2.hex()) | repo.vfs.write(b'updatestate', p2.hex()) | ||||
| # Advertise fsmonitor when its presence could be useful. | # Advertise fsmonitor when its presence could be useful. | ||||
| # | # | ||||
| # We only advertise when performing an update from an empty working | # We only advertise when performing an update from an empty working | ||||
| # directory. This typically only occurs during initial clone. | # directory. This typically only occurs during initial clone. | ||||
| repo.ui.warn( | repo.ui.warn( | ||||
| _( | _( | ||||
| b'(warning: large working directory being used without ' | b'(warning: large working directory being used without ' | ||||
| b'fsmonitor enabled; enable fsmonitor to improve performance; ' | b'fsmonitor enabled; enable fsmonitor to improve performance; ' | ||||
| b'see "hg help -e fsmonitor")\n' | b'see "hg help -e fsmonitor")\n' | ||||
| ) | ) | ||||
| ) | ) | ||||
| updatedirstate = not partial and not wc.isinmemory() | |||||
| wantfiledata = updatedirstate and not branchmerge | wantfiledata = updatedirstate and not branchmerge | ||||
| stats, getfiledata = applyupdates( | stats, getfiledata = applyupdates( | ||||
| repo, actions, wc, p2, overwrite, wantfiledata, labels=labels | repo, actions, wc, p2, overwrite, wantfiledata, labels=labels | ||||
| ) | ) | ||||
| if updatedirstate: | if updatedirstate: | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.setparents(fp1, fp2) | repo.setparents(fp1, fp2) | ||||