Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3036
- 30c81c9e88b8
- parent 3034
- 7ce719013078
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3035:36e9f388958b | 3036:30c81c9e88b8 |
|---|---|
| 809 bookmarksList = None | 809 bookmarksList = None |
| 810 | 810 |
| 811 from .HgMultiRevisionSelectionDialog import \ | 811 from .HgMultiRevisionSelectionDialog import \ |
| 812 HgMultiRevisionSelectionDialog | 812 HgMultiRevisionSelectionDialog |
| 813 dlg = HgMultiRevisionSelectionDialog( | 813 dlg = HgMultiRevisionSelectionDialog( |
| 814 self.hgGetTagsList(repodir), | 814 self.hgGetTagsList(repodir), |
| 815 self.hgGetBranchesList(repodir), | 815 self.hgGetBranchesList(repodir), |
| 816 bookmarksList, | 816 bookmarksList, |
| 817 emptyRevsOk=True, | 817 emptyRevsOk=True, |
| 818 showLimit=True, | 818 showLimit=True, |
| 819 limitDefault=self.getPlugin().getPreferences("LogLimit")) | 819 limitDefault=self.getPlugin().getPreferences("LogLimit")) |
| 820 if dlg.exec_() == QDialog.Accepted: | 820 if dlg.exec_() == QDialog.Accepted: |
| 821 revs, noEntries = dlg.getRevisions() | 821 revs, noEntries = dlg.getRevisions() |
| 822 from .HgLogDialog import HgLogDialog | 822 from .HgLogDialog import HgLogDialog |
| 823 self.log = HgLogDialog(self, isFile=isFile) | 823 self.log = HgLogDialog(self, isFile=isFile) |
| 824 self.log.show() | 824 self.log.show() |
| 1416 """<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>\n""" | 1416 """<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>\n""" |
| 1417 """<tr></tr>\n""" | 1417 """<tr></tr>\n""" |
| 1418 """<tr><td><b>URL</b></td><td>{1}</td></tr>\n""" | 1418 """<tr><td><b>URL</b></td><td>{1}</td></tr>\n""" |
| 1419 """{2}""" | 1419 """{2}""" |
| 1420 """</table></p>\n""" | 1420 """</table></p>\n""" |
| 1421 ).format(self.versionStr, url, infoStr) | 1421 ).format(self.versionStr, url, infoStr) |
| 1422 | 1422 |
| 1423 ########################################################################### | 1423 ########################################################################### |
| 1424 ## Private Mercurial specific methods are below. | 1424 ## Private Mercurial specific methods are below. |
| 1425 ########################################################################### | 1425 ########################################################################### |
| 1426 | 1426 |
| 1812 E5MessageBox.critical( | 1812 E5MessageBox.critical( |
| 1813 self.__ui, | 1813 self.__ui, |
| 1814 self.trUtf8("Mercurial Side-by-Side Difference"), | 1814 self.trUtf8("Mercurial Side-by-Side Difference"), |
| 1815 self.trUtf8( | 1815 self.trUtf8( |
| 1816 """<p>The file <b>{0}</b> could not be read.</p>""") | 1816 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 1817 .format(name)) | 1817 .format(name)) |
| 1818 return | 1818 return |
| 1819 | 1819 |
| 1820 if self.sbsDiff is None: | 1820 if self.sbsDiff is None: |
| 1821 from UI.CompareDialog import CompareDialog | 1821 from UI.CompareDialog import CompareDialog |
| 1822 self.sbsDiff = CompareDialog() | 1822 self.sbsDiff = CompareDialog() |
| 2914 from .HgGraftDialog import HgGraftDialog | 2914 from .HgGraftDialog import HgGraftDialog |
| 2915 res = False | 2915 res = False |
| 2916 dlg = HgGraftDialog(self, revs) | 2916 dlg = HgGraftDialog(self, revs) |
| 2917 if dlg.exec_() == QDialog.Accepted: | 2917 if dlg.exec_() == QDialog.Accepted: |
| 2918 revs, (userData, currentUser, userName), \ | 2918 revs, (userData, currentUser, userName), \ |
| 2919 (dateData, currentDate, dateStr), log, dryrun = dlg.getData() | 2919 (dateData, currentDate, dateStr), log, dryrun = dlg.getData() |
| 2920 | 2920 |
| 2921 args = [] | 2921 args = [] |
| 2922 args.append("graft") | 2922 args.append("graft") |
| 2923 args.append("--verbose") | 2923 args.append("--verbose") |
| 2924 if userData: | 2924 if userData: |
| 3059 self.__ui, | 3059 self.__ui, |
| 3060 self.trUtf8("Add Sub-repository"), | 3060 self.trUtf8("Add Sub-repository"), |
| 3061 self.trUtf8( | 3061 self.trUtf8( |
| 3062 """<p>The sub-repositories file .hgsub could not""" | 3062 """<p>The sub-repositories file .hgsub could not""" |
| 3063 """ be read.</p><p>Reason: {0}</p>""") | 3063 """ be read.</p><p>Reason: {0}</p>""") |
| 3064 .format(str(err))) | 3064 .format(str(err))) |
| 3065 return | 3065 return |
| 3066 | 3066 |
| 3067 if entry in contents: | 3067 if entry in contents: |
| 3068 E5MessageBox.critical( | 3068 E5MessageBox.critical( |
| 3069 self.__ui, | 3069 self.__ui, |
| 3088 self.__ui, | 3088 self.__ui, |
| 3089 self.trUtf8("Add Sub-repository"), | 3089 self.trUtf8("Add Sub-repository"), |
| 3090 self.trUtf8( | 3090 self.trUtf8( |
| 3091 """<p>The sub-repositories file .hgsub could not""" | 3091 """<p>The sub-repositories file .hgsub could not""" |
| 3092 """ be written to.</p><p>Reason: {0}</p>""") | 3092 """ be written to.</p><p>Reason: {0}</p>""") |
| 3093 .format(str(err))) | 3093 .format(str(err))) |
| 3094 return | 3094 return |
| 3095 | 3095 |
| 3096 if needsAdd: | 3096 if needsAdd: |
| 3097 self.vcsAdd(hgsub) | 3097 self.vcsAdd(hgsub) |
| 3098 self.__projectHelper.getProject().appendFile(hgsub) | 3098 self.__projectHelper.getProject().appendFile(hgsub) |
| 3120 E5MessageBox.critical( | 3120 E5MessageBox.critical( |
| 3121 self.__ui, | 3121 self.__ui, |
| 3122 self.trUtf8("Remove Sub-repositories"), | 3122 self.trUtf8("Remove Sub-repositories"), |
| 3123 self.trUtf8("""<p>The sub-repositories file .hgsub could not""" | 3123 self.trUtf8("""<p>The sub-repositories file .hgsub could not""" |
| 3124 """ be read.</p><p>Reason: {0}</p>""") | 3124 """ be read.</p><p>Reason: {0}</p>""") |
| 3125 .format(str(err))) | 3125 .format(str(err))) |
| 3126 return | 3126 return |
| 3127 | 3127 |
| 3128 from .HgRemoveSubrepositoriesDialog import \ | 3128 from .HgRemoveSubrepositoriesDialog import \ |
| 3129 HgRemoveSubrepositoriesDialog | 3129 HgRemoveSubrepositoriesDialog |
| 3130 dlg = HgRemoveSubrepositoriesDialog(subrepositories) | 3130 dlg = HgRemoveSubrepositoriesDialog(subrepositories) |
| 3140 self.__ui, | 3140 self.__ui, |
| 3141 self.trUtf8("Remove Sub-repositories"), | 3141 self.trUtf8("Remove Sub-repositories"), |
| 3142 self.trUtf8( | 3142 self.trUtf8( |
| 3143 """<p>The sub-repositories file .hgsub could not""" | 3143 """<p>The sub-repositories file .hgsub could not""" |
| 3144 """ be written to.</p><p>Reason: {0}</p>""") | 3144 """ be written to.</p><p>Reason: {0}</p>""") |
| 3145 .format(str(err))) | 3145 .format(str(err))) |
| 3146 return | 3146 return |
| 3147 | 3147 |
| 3148 if deleteSubrepos: | 3148 if deleteSubrepos: |
| 3149 ppath = self.__projectHelper.getProject().getProjectPath() | 3149 ppath = self.__projectHelper.getProject().getProjectPath() |
| 3150 for removedSubrepo in removedSubrepos: | 3150 for removedSubrepo in removedSubrepos: |
