| durin42 | |
| pulkit |
| hg-reviewers |
merge.update() takes a lot of parameters and I get confused all the
time which is which.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/histedit.py (3 lines) | |||
| M | hgext/rebase.py (7 lines) | |||
| M | hgext/shelve.py (2 lines) | |||
| M | hgext/transplant.py (5 lines) | |||
| M | mercurial/cmdutil.py (4 lines) | |||
| M | mercurial/commands.py (4 lines) | |||
| M | mercurial/hg.py (6 lines) | |||
| M | tests/test-revlog-ancestry.py (4 lines) |
| return repo[n], replacements | return repo[n], replacements | ||||
| @action(['base', 'b'], | @action(['base', 'b'], | ||||
| _('checkout changeset and apply further changesets from there')) | _('checkout changeset and apply further changesets from there')) | ||||
| class base(histeditaction): | class base(histeditaction): | ||||
| def run(self): | def run(self): | ||||
| if self.repo['.'].node() != self.node: | if self.repo['.'].node() != self.node: | ||||
| mergemod.update(self.repo, self.node, False, True) | mergemod.update(self.repo, self.node, branchmerge=False, force=True) | ||||
| # branchmerge, force) | |||||
| return self.continueclean() | return self.continueclean() | ||||
| def continuedirty(self): | def continuedirty(self): | ||||
| abortdirty() | abortdirty() | ||||
| def continueclean(self): | def continueclean(self): | ||||
| basectx = self.repo['.'] | basectx = self.repo['.'] | ||||
| return basectx, [] | return basectx, [] | ||||
| 'Rebase a single revision rev on top of p1 using base as merge ancestor' | 'Rebase a single revision rev on top of p1 using base as merge ancestor' | ||||
| # Merge phase | # Merge phase | ||||
| # Update to destination and merge it with local | # Update to destination and merge it with local | ||||
| if wctx.isinmemory(): | if wctx.isinmemory(): | ||||
| wctx.setbase(repo[p1]) | wctx.setbase(repo[p1]) | ||||
| else: | else: | ||||
| if repo['.'].rev() != p1: | if repo['.'].rev() != p1: | ||||
| repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | ||||
| mergemod.update(repo, p1, False, True) | mergemod.update(repo, p1, branchmerge=False, force=True) | ||||
| else: | else: | ||||
| repo.ui.debug(" already in destination\n") | repo.ui.debug(" already in destination\n") | ||||
| # This is, alas, necessary to invalidate workingctx's manifest cache, | # This is, alas, necessary to invalidate workingctx's manifest cache, | ||||
| # as well as other data we litter on it in other places. | # as well as other data we litter on it in other places. | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| repo.dirstate.write(repo.currenttransaction()) | repo.dirstate.write(repo.currenttransaction()) | ||||
| repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) | repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev])) | ||||
| if base is not None: | if base is not None: | ||||
| repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) | repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) | ||||
| # When collapsing in-place, the parent is the common ancestor, we | # When collapsing in-place, the parent is the common ancestor, we | ||||
| # have to allow merging with it. | # have to allow merging with it. | ||||
| stats = mergemod.update(repo, rev, True, True, base, collapse, | stats = mergemod.update(repo, rev, branchmerge=True, force=True, | ||||
| ancestor=base, mergeancestor=collapse, | |||||
| labels=['dest', 'source'], wc=wctx) | labels=['dest', 'source'], wc=wctx) | ||||
| if collapse: | if collapse: | ||||
| copies.duplicatecopies(repo, wctx, rev, dest) | copies.duplicatecopies(repo, wctx, rev, dest) | ||||
| else: | else: | ||||
| # If we're not using --collapse, we need to | # If we're not using --collapse, we need to | ||||
| # duplicate copies between the revision we're | # duplicate copies between the revision we're | ||||
| # rebasing and its first parent, but *not* | # rebasing and its first parent, but *not* | ||||
| # duplicate any copies that have already been | # duplicate any copies that have already been | ||||
| updateifonnodes = set(rebased) | updateifonnodes = set(rebased) | ||||
| updateifonnodes.update(destmap.values()) | updateifonnodes.update(destmap.values()) | ||||
| updateifonnodes.add(originalwd) | updateifonnodes.add(originalwd) | ||||
| shouldupdate = repo['.'].rev() in updateifonnodes | shouldupdate = repo['.'].rev() in updateifonnodes | ||||
| # Update away from the rebase if necessary | # Update away from the rebase if necessary | ||||
| if shouldupdate or needupdate(repo, state): | if shouldupdate or needupdate(repo, state): | ||||
| mergemod.update(repo, originalwd, False, True) | mergemod.update(repo, originalwd, branchmerge=False, force=True) | ||||
| # Strip from the first rebased revision | # Strip from the first rebased revision | ||||
| if rebased: | if rebased: | ||||
| repair.strip(repo.ui, repo, strippoints, backup=backup) | repair.strip(repo.ui, repo, strippoints, backup=backup) | ||||
| if activebookmark and activebookmark in repo._bookmarks: | if activebookmark and activebookmark in repo._bookmarks: | ||||
| bookmarks.activate(repo, activebookmark) | bookmarks.activate(repo, activebookmark) | ||||
| return [repo.pathto(f, cwd) for f in files] | return [repo.pathto(f, cwd) for f in files] | ||||
| def unshelveabort(ui, repo, state, opts): | def unshelveabort(ui, repo, state, opts): | ||||
| """subcommand that abort an in-progress unshelve""" | """subcommand that abort an in-progress unshelve""" | ||||
| with repo.lock(): | with repo.lock(): | ||||
| try: | try: | ||||
| checkparents(repo, state) | checkparents(repo, state) | ||||
| merge.update(repo, state.pendingctx, False, True) | merge.update(repo, state.pendingctx, branchmerge=False, force=True) | ||||
| if (state.activebookmark | if (state.activebookmark | ||||
| and state.activebookmark in repo._bookmarks): | and state.activebookmark in repo._bookmarks): | ||||
| bookmarks.activate(repo, state.activebookmark) | bookmarks.activate(repo, state.activebookmark) | ||||
| if repo.vfs.exists('unshelverebasestate'): | if repo.vfs.exists('unshelverebasestate'): | ||||
| repo.vfs.rename('unshelverebasestate', 'rebasestate') | repo.vfs.rename('unshelverebasestate', 'rebasestate') | ||||
| rebase.clearstatus(repo) | rebase.clearstatus(repo) | ||||
| # wdir's parent, just pull it. | # wdir's parent, just pull it. | ||||
| if parents[0] == p1: | if parents[0] == p1: | ||||
| pulls.append(node) | pulls.append(node) | ||||
| p1 = node | p1 = node | ||||
| continue | continue | ||||
| if pulls: | if pulls: | ||||
| if source != repo: | if source != repo: | ||||
| exchange.pull(repo, source.peer(), heads=pulls) | exchange.pull(repo, source.peer(), heads=pulls) | ||||
| merge.update(repo, pulls[-1], False, False) | merge.update(repo, pulls[-1], branchmerge=False, | ||||
| force=False) | |||||
| p1, p2 = repo.dirstate.parents() | p1, p2 = repo.dirstate.parents() | ||||
| pulls = [] | pulls = [] | ||||
| domerge = False | domerge = False | ||||
| if node in merges: | if node in merges: | ||||
| # pulling all the merge revs at once would mean we | # pulling all the merge revs at once would mean we | ||||
| # couldn't transplant after the latest even if | # couldn't transplant after the latest even if | ||||
| # transplants before them fail. | # transplants before them fail. | ||||
| % (nodemod.short(node), | % (nodemod.short(node), | ||||
| nodemod.short(n))) | nodemod.short(n))) | ||||
| finally: | finally: | ||||
| if patchfile: | if patchfile: | ||||
| os.unlink(patchfile) | os.unlink(patchfile) | ||||
| tr.close() | tr.close() | ||||
| if pulls: | if pulls: | ||||
| exchange.pull(repo, source.peer(), heads=pulls) | exchange.pull(repo, source.peer(), heads=pulls) | ||||
| merge.update(repo, pulls[-1], False, False) | merge.update(repo, pulls[-1], branchmerge=False, force=False) | ||||
| finally: | finally: | ||||
| self.saveseries(revmap, merges) | self.saveseries(revmap, merges) | ||||
| self.transplants.write() | self.transplants.write() | ||||
| if tr: | if tr: | ||||
| tr.release() | tr.release() | ||||
| if lock: | if lock: | ||||
| lock.release() | lock.release() | ||||
| fp.write(reviewedpatch) | fp.write(reviewedpatch) | ||||
| fp.seek(0) | fp.seek(0) | ||||
| [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] | [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] | ||||
| # 3a. apply filtered patch to clean repo (clean) | # 3a. apply filtered patch to clean repo (clean) | ||||
| if backups: | if backups: | ||||
| # Equivalent to hg.revert | # Equivalent to hg.revert | ||||
| m = scmutil.matchfiles(repo, backups.keys()) | m = scmutil.matchfiles(repo, backups.keys()) | ||||
| mergemod.update(repo, repo.dirstate.p1(), | mergemod.update(repo, repo.dirstate.p1(), branchmerge=False, | ||||
| False, True, matcher=m) | force=True, matcher=m) | ||||
| # 3b. (apply) | # 3b. (apply) | ||||
| if dopatch: | if dopatch: | ||||
| try: | try: | ||||
| ui.debug('applying patch\n') | ui.debug('applying patch\n') | ||||
| ui.debug(fp.getvalue()) | ui.debug(fp.getvalue()) | ||||
| patch.internalpatch(ui, repo, fp, 1, eolmode=None) | patch.internalpatch(ui, repo, fp, 1, eolmode=None) | ||||
| except error.PatchError as err: | except error.PatchError as err: | ||||
| # the backout should appear on the same branch | # the backout should appear on the same branch | ||||
| branch = repo.dirstate.branch() | branch = repo.dirstate.branch() | ||||
| bheads = repo.branchheads(branch) | bheads = repo.branchheads(branch) | ||||
| rctx = scmutil.revsingle(repo, hex(parent)) | rctx = scmutil.revsingle(repo, hex(parent)) | ||||
| if not opts.get('merge') and op1 != node: | if not opts.get('merge') and op1 != node: | ||||
| with dirstateguard.dirstateguard(repo, 'backout'): | with dirstateguard.dirstateguard(repo, 'backout'): | ||||
| overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | ||||
| with ui.configoverride(overrides, 'backout'): | with ui.configoverride(overrides, 'backout'): | ||||
| stats = mergemod.update(repo, parent, True, True, node, False) | stats = mergemod.update(repo, parent, branchmerge=True, | ||||
| force=True, ancestor=node, | |||||
| mergeancestor=False) | |||||
| repo.setparents(op1, op2) | repo.setparents(op1, op2) | ||||
| hg._showstats(repo, stats) | hg._showstats(repo, stats) | ||||
| if stats.unresolvedcount: | if stats.unresolvedcount: | ||||
| repo.ui.status(_("use 'hg resolve' to retry unresolved " | repo.ui.status(_("use 'hg resolve' to retry unresolved " | ||||
| "file merges\n")) | "file merges\n")) | ||||
| return 1 | return 1 | ||||
| else: | else: | ||||
| hg.clean(repo, node, show_stats=False) | hg.clean(repo, node, show_stats=False) | ||||
| stats.removedcount, stats.unresolvedcount)) | stats.removedcount, stats.unresolvedcount)) | ||||
| def updaterepo(repo, node, overwrite, updatecheck=None): | def updaterepo(repo, node, overwrite, updatecheck=None): | ||||
| """Update the working directory to node. | """Update the working directory to node. | ||||
| When overwrite is set, changes are clobbered, merged else | When overwrite is set, changes are clobbered, merged else | ||||
| returns stats (see pydoc mercurial.merge.applyupdates)""" | returns stats (see pydoc mercurial.merge.applyupdates)""" | ||||
| return mergemod.update(repo, node, False, overwrite, | return mergemod.update(repo, node, branchmerge=False, force=overwrite, | ||||
| labels=['working copy', 'destination'], | labels=['working copy', 'destination'], | ||||
| updatecheck=updatecheck) | updatecheck=updatecheck) | ||||
| def update(repo, node, quietempty=False, updatecheck=None): | def update(repo, node, quietempty=False, updatecheck=None): | ||||
| """update the working directory to node""" | """update the working directory to node""" | ||||
| stats = updaterepo(repo, node, False, updatecheck=updatecheck) | stats = updaterepo(repo, node, False, updatecheck=updatecheck) | ||||
| _showstats(repo, stats, quietempty) | _showstats(repo, stats, quietempty) | ||||
| if stats.unresolvedcount: | if stats.unresolvedcount: | ||||
| return ret | return ret | ||||
| def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None, | def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None, | ||||
| abort=False): | abort=False): | ||||
| """Branch merge with node, resolving changes. Return true if any | """Branch merge with node, resolving changes. Return true if any | ||||
| unresolved conflicts.""" | unresolved conflicts.""" | ||||
| if not abort: | if not abort: | ||||
| stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce, | stats = mergemod.update(repo, node, branchmerge=True, force=force, | ||||
| labels=labels) | mergeforce=mergeforce, labels=labels) | ||||
| else: | else: | ||||
| ms = mergemod.mergestate.read(repo) | ms = mergemod.mergestate.read(repo) | ||||
| if ms.active(): | if ms.active(): | ||||
| # there were conflicts | # there were conflicts | ||||
| node = ms.localctx.hex() | node = ms.localctx.hex() | ||||
| else: | else: | ||||
| # there were no conficts, mergestate was not stored | # there were no conficts, mergestate was not stored | ||||
| node = repo['.'].hex() | node = repo['.'].hex() | ||||
| def addcommit(name, time): | def addcommit(name, time): | ||||
| f = open(name, 'wb') | f = open(name, 'wb') | ||||
| f.write(b'%s\n' % name) | f.write(b'%s\n' % name) | ||||
| f.close() | f.close() | ||||
| repo[None].add([name]) | repo[None].add([name]) | ||||
| commit(name, time) | commit(name, time) | ||||
| def update(rev): | def update(rev): | ||||
| merge.update(repo, rev, False, True) | merge.update(repo, rev, branchmerge=False, force=True) | ||||
| def merge_(rev): | def merge_(rev): | ||||
| merge.update(repo, rev, True, False) | merge.update(repo, rev, branchmerge=True, force=False) | ||||
| if __name__ == '__main__': | if __name__ == '__main__': | ||||
| addcommit(b"A", 0) | addcommit(b"A", 0) | ||||
| addcommit(b"B", 1) | addcommit(b"B", 1) | ||||
| update(0) | update(0) | ||||
| addcommit(b"C", 2) | addcommit(b"C", 2) | ||||