| 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/cmdutil.py (34 lines) | |||
| M | tests/test-update-branches.t (28 lines) |
| unresolvedpaths = attr.ib() | unresolvedpaths = attr.ib() | ||||
| _label = b'status.morestatus' | _label = b'status.morestatus' | ||||
| def formatfile(self, path, fm): | def formatfile(self, path, fm): | ||||
| if self.activemerge and path in self.unresolvedpaths: | if self.activemerge and path in self.unresolvedpaths: | ||||
| fm.data(unresolved=True) | fm.data(unresolved=True) | ||||
| def formatfooter(self, fm): | def formatfooter(self, fm): | ||||
| if self.unfinishedop or self.unfinishedmsg: | |||||
| fm.startitem() | fm.startitem() | ||||
| fm.data( | fm.data(itemtype=b'morestatus') | ||||
| itemtype=b'morestatus', | |||||
| unfinished=self.unfinishedop, | |||||
| unfinishedmsg=self.unfinishedmsg, | |||||
| ) | |||||
| if self.unfinishedop: | |||||
| fm.data(unfinished=self.unfinishedop) | |||||
| statemsg = ( | statemsg = ( | ||||
| _(b'The repository is in an unfinished *%s* state.') | _(b'The repository is in an unfinished *%s* state.') | ||||
| % self.unfinishedop | % self.unfinishedop | ||||
| ) | ) | ||||
| fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) | fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label) | ||||
| if self.unfinishedmsg: | |||||
| fm.data(unfinishedmsg=self.unfinishedmsg) | |||||
| self._formatconflicts(fm) | self._formatconflicts(fm) | ||||
| if self.unfinishedmsg: | if self.unfinishedmsg: | ||||
| fm.plain( | fm.plain( | ||||
| b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label | b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label | ||||
| ) | ) | ||||
| def _formatconflicts(self, fm): | def _formatconflicts(self, fm): | ||||
| if not self.activemerge: | if not self.activemerge: | ||||
| return | return | ||||
| fm.plain(b'%s\n' % _commentlines(msg), label=self._label) | fm.plain(b'%s\n' % _commentlines(msg), label=self._label) | ||||
| def readmorestatus(repo): | def readmorestatus(repo): | ||||
| """Returns a morestatus object if the repo has unfinished state.""" | """Returns a morestatus object if the repo has unfinished state.""" | ||||
| statetuple = statemod.getrepostate(repo) | statetuple = statemod.getrepostate(repo) | ||||
| mergestate = mergemod.mergestate.read(repo) | mergestate = mergemod.mergestate.read(repo) | ||||
| activemerge = mergestate.active() | activemerge = mergestate.active() | ||||
| if not statetuple: | if not statetuple and not activemerge: | ||||
| return None | return None | ||||
| unfinishedop = unfinishedmsg = unresolved = None | |||||
| if statetuple: | |||||
| unfinishedop, unfinishedmsg = statetuple | unfinishedop, unfinishedmsg = statetuple | ||||
| mergestate = mergemod.mergestate.read(repo) | |||||
| unresolved = None | |||||
| if activemerge: | if activemerge: | ||||
| unresolved = sorted(mergestate.unresolved()) | unresolved = sorted(mergestate.unresolved()) | ||||
| return morestatus( | return morestatus( | ||||
| repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved | repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved | ||||
| ) | ) | ||||
| def findpossible(cmd, table, strict=False): | def findpossible(cmd, table, strict=False): | ||||
| merging a | merging a | ||||
| warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
| use 'hg resolve' to retry unresolved file merges | use 'hg resolve' to retry unresolved file merges | ||||
| [1] | [1] | ||||
| $ hg st | $ hg st | ||||
| M a | M a | ||||
| ? a.orig | ? a.orig | ||||
| # Unresolved merge conflicts: | |||||
| # | |||||
| # a | |||||
| # | |||||
| # To mark files as resolved: hg resolve --mark FILE | |||||
| $ cat a | $ cat a | ||||
| <<<<<<< working copy: 6efa171f091b - test: 3 | <<<<<<< working copy: 6efa171f091b - test: 3 | ||||
| three | three | ||||
| dirty | dirty | ||||
| ||||||| base | ||||||| base | ||||
| three | three | ||||
| ======= | ======= | ||||
| four | four | ||||
| merging a | merging a | ||||
| warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | ||||
| 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
| use 'hg resolve' to retry unresolved file merges | use 'hg resolve' to retry unresolved file merges | ||||
| [1] | [1] | ||||
| $ rm a.orig | $ rm a.orig | ||||
| $ hg status | $ hg status | ||||
| M a | M a | ||||
| # Unresolved merge conflicts: | |||||
| # | |||||
| # a | |||||
| # | |||||
| # To mark files as resolved: hg resolve --mark FILE | |||||
| $ hg resolve -l | $ hg resolve -l | ||||
| U a | U a | ||||
| Change/delete conflict is not allowed | Change/delete conflict is not allowed | ||||
| $ hg up -qC 3 | $ hg up -qC 3 | ||||
| $ hg rm foo | $ hg rm foo | ||||
| $ hg up -q 4 | $ hg up -q 4 | ||||
| Test that statuses are reported properly before and after merge resolution. | Test that statuses are reported properly before and after merge resolution. | ||||
| $ rm a.orig | $ rm a.orig | ||||
| $ hg resolve -l | $ hg resolve -l | ||||
| U a | U a | ||||
| $ hg status | $ hg status | ||||
| M a | M a | ||||
| M foo | M foo | ||||
| # Unresolved merge conflicts: | |||||
| # | |||||
| # a | |||||
| # | |||||
| # To mark files as resolved: hg resolve --mark FILE | |||||
| $ hg revert -r . a | $ hg revert -r . a | ||||
| $ rm a.orig | $ rm a.orig | ||||
| $ hg resolve -l | $ hg resolve -l | ||||
| U a | U a | ||||
| $ hg status | $ hg status | ||||
| M foo | M foo | ||||
| # Unresolved merge conflicts: | |||||
| # | |||||
| # a | |||||
| # | |||||
| # To mark files as resolved: hg resolve --mark FILE | |||||
| $ hg status -Tjson | $ hg status -Tjson | ||||
| [ | [ | ||||
| { | { | ||||
| "itemtype": "file", | "itemtype": "file", | ||||
| "path": "foo", | "path": "foo", | ||||
| "status": "M" | "status": "M" | ||||
| } | } | ||||
| ] | ] | ||||
| $ hg resolve -m | $ hg resolve -m | ||||
| (no more unresolved files) | (no more unresolved files) | ||||
| $ hg resolve -l | $ hg resolve -l | ||||
| R a | R a | ||||
| $ hg status | $ hg status | ||||
| M foo | M foo | ||||
| # No unresolved merge conflicts. | |||||
| $ hg status -Tjson | $ hg status -Tjson | ||||
| [ | [ | ||||
| { | { | ||||
| "itemtype": "file", | "itemtype": "file", | ||||
| "path": "foo", | "path": "foo", | ||||
| "status": "M" | "status": "M" | ||||
| } | } | ||||
| ] | ] | ||||
| Test that 4 is detected as the no-argument destination from 3 and also moves | Test that 4 is detected as the no-argument destination from 3 and also moves | ||||
| the bookmark with it | the bookmark with it | ||||
| $ hg up --quiet 0 # we should be able to update to 3 directly | $ hg up --quiet 0 # we should be able to update to 3 directly | ||||
| $ hg status | |||||
| M foo | |||||
| $ hg up --quiet --hidden 3 # but not implemented yet. | $ hg up --quiet --hidden 3 # but not implemented yet. | ||||
| updated to hidden changeset 6efa171f091b | updated to hidden changeset 6efa171f091b | ||||
| (hidden revision '6efa171f091b' was rewritten as: d047485b3896) | (hidden revision '6efa171f091b' was rewritten as: d047485b3896) | ||||
| $ hg book -f bm | $ hg book -f bm | ||||
| $ hg up | $ hg up | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| updating bookmark bm | updating bookmark bm | ||||
| $ hg book | $ hg book | ||||