Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 5496
- d157a2319073
- parent 5452
- 9f89364d9ffd
- child 5501
- 59ed7b2dd952
equal
deleted
inserted
replaced
| 5495:9584e91c9857 | 5496:d157a2319073 |
|---|---|
| 1008 else: | 1008 else: |
| 1009 res = False | 1009 res = False |
| 1010 | 1010 |
| 1011 return res | 1011 return res |
| 1012 | 1012 |
| 1013 def vcsMerge(self, name): | 1013 def vcsMerge(self, name, rev=""): |
| 1014 """ | 1014 """ |
| 1015 Public method used to merge a URL/revision into the local project. | 1015 Public method used to merge a URL/revision into the local project. |
| 1016 | 1016 |
| 1017 @param name file/directory name to be merged (string) | 1017 @param name file/directory name to be merged |
| 1018 @type str | |
| 1019 @keyparam rev revision to merge with | |
| 1020 @type str | |
| 1018 """ | 1021 """ |
| 1019 dname, fname = self.splitPath(name) | 1022 dname, fname = self.splitPath(name) |
| 1020 | 1023 |
| 1021 # find the root of the repo | 1024 # find the root of the repo |
| 1022 repodir = dname | 1025 repodir = dname |
| 1023 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1026 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1024 repodir = os.path.dirname(repodir) | 1027 repodir = os.path.dirname(repodir) |
| 1025 if os.path.splitdrive(repodir)[1] == os.sep: | 1028 if os.path.splitdrive(repodir)[1] == os.sep: |
| 1026 return | 1029 return |
| 1027 | 1030 |
| 1028 from .HgMergeDialog import HgMergeDialog | 1031 if not rev: |
| 1029 dlg = HgMergeDialog(self.hgGetTagsList(repodir), | 1032 from .HgMergeDialog import HgMergeDialog |
| 1030 self.hgGetBranchesList(repodir), | 1033 dlg = HgMergeDialog(self.hgGetTagsList(repodir), |
| 1031 self.hgGetBookmarksList(repodir)) | 1034 self.hgGetBranchesList(repodir), |
| 1032 if dlg.exec_() == QDialog.Accepted: | 1035 self.hgGetBookmarksList(repodir)) |
| 1033 rev, force = dlg.getParameters() | 1036 if dlg.exec_() == QDialog.Accepted: |
| 1034 else: | 1037 rev, force = dlg.getParameters() |
| 1035 return | 1038 else: |
| 1039 return | |
| 1040 else: | |
| 1041 force = False | |
| 1036 | 1042 |
| 1037 args = self.initCommand("merge") | 1043 args = self.initCommand("merge") |
| 1038 if force: | 1044 if force: |
| 1039 args.append("--force") | 1045 args.append("--force") |
| 1040 if self.getPlugin().getPreferences("InternalMerge"): | 1046 if self.getPlugin().getPreferences("InternalMerge"): |
