Show More
@@ -792,8 +792,20 b' class HgRemote(object):' | |||
|
792 | 792 | # setting the interactive flag to `False` mercurial doesn't prompt the |
|
793 | 793 | # used but instead uses a default value. |
|
794 | 794 | repo.ui.setconfig('ui', 'interactive', False) |
|
795 | commands.merge(baseui, repo, rev=revision) | |
|
795 | 796 | |
|
796 | commands.merge(baseui, repo, rev=revision) | |
|
797 | @reraise_safe_exceptions | |
|
798 | def merge_state(self, wire): | |
|
799 | repo = self._factory.repo(wire) | |
|
800 | repo.ui.setconfig('ui', 'merge', 'internal:dump') | |
|
801 | ||
|
802 | # In case of sub repositories are used mercurial prompts the user in | |
|
803 | # case of merge conflicts or different sub repository sources. By | |
|
804 | # setting the interactive flag to `False` mercurial doesn't prompt the | |
|
805 | # used but instead uses a default value. | |
|
806 | repo.ui.setconfig('ui', 'interactive', False) | |
|
807 | ms = hg_merge.mergestate(repo) | |
|
808 | return [x for x in ms.unresolved()] | |
|
797 | 809 | |
|
798 | 810 | @reraise_safe_exceptions |
|
799 | 811 | def commit(self, wire, message, username, close_branch=False): |
@@ -802,6 +814,7 b' class HgRemote(object):' | |||
|
802 | 814 | repo.ui.setconfig('ui', 'username', username) |
|
803 | 815 | commands.commit(baseui, repo, message=message, close_branch=close_branch) |
|
804 | 816 | |
|
817 | ||
|
805 | 818 | @reraise_safe_exceptions |
|
806 | 819 | def rebase(self, wire, source=None, dest=None, abort=False): |
|
807 | 820 | repo = self._factory.repo(wire) |
General Comments 0
You need to be logged in to leave comments.
Login now