Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 2576
- b984efd69f15
- parent 2543
- eb9472947653
- child 2597
- 951e631c9c1d
equal
deleted
inserted
replaced
| 2570:a2de94bae41b | 2576:b984efd69f15 |
|---|---|
| 99 self.repoEditor = None | 99 self.repoEditor = None |
| 100 self.userEditor = None | 100 self.userEditor = None |
| 101 self.serveDlg = None | 101 self.serveDlg = None |
| 102 | 102 |
| 103 self.bundleFile = None | 103 self.bundleFile = None |
| 104 self.__lastChangeGroupPath = None | |
| 104 | 105 |
| 105 self.statusCache = {} | 106 self.statusCache = {} |
| 106 | 107 |
| 107 self.__commitData = {} | 108 self.__commitData = {} |
| 108 self.__commitDialog = None | 109 self.__commitDialog = None |
| 2139 revs, baseRevs, compression, all = dlg.getParameters() | 2140 revs, baseRevs, compression, all = dlg.getParameters() |
| 2140 | 2141 |
| 2141 fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( | 2142 fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( |
| 2142 None, | 2143 None, |
| 2143 self.trUtf8("Create changegroup"), | 2144 self.trUtf8("Create changegroup"), |
| 2144 repodir, | 2145 self.__lastChangeGroupPath or repodir, |
| 2145 self.trUtf8("Mercurial Changegroup Files (*.hg)"), | 2146 self.trUtf8("Mercurial Changegroup Files (*.hg)"), |
| 2146 None, | 2147 None, |
| 2147 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) | 2148 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) |
| 2148 | 2149 |
| 2149 if not fname: | 2150 if not fname: |
| 2162 .format(fname), | 2163 .format(fname), |
| 2163 icon=E5MessageBox.Warning) | 2164 icon=E5MessageBox.Warning) |
| 2164 if not res: | 2165 if not res: |
| 2165 return | 2166 return |
| 2166 fname = Utilities.toNativeSeparators(fname) | 2167 fname = Utilities.toNativeSeparators(fname) |
| 2168 self.__lastChangeGroupPath = os.path.dirname(fname) | |
| 2167 | 2169 |
| 2168 args = [] | 2170 args = [] |
| 2169 args.append('bundle') | 2171 args.append('bundle') |
| 2170 if all: | 2172 if all: |
| 2171 args.append("--all") | 2173 args.append("--all") |
| 2202 return | 2204 return |
| 2203 | 2205 |
| 2204 file = E5FileDialog.getOpenFileName( | 2206 file = E5FileDialog.getOpenFileName( |
| 2205 None, | 2207 None, |
| 2206 self.trUtf8("Preview changegroup"), | 2208 self.trUtf8("Preview changegroup"), |
| 2207 repodir, | 2209 self.__lastChangeGroupPath or repodir, |
| 2208 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 2210 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 2209 if file: | 2211 if file: |
| 2212 self.__lastChangeGroupPath = os.path.dirname(self.__lastChangeGroupPath) | |
| 2213 | |
| 2210 if self.getPlugin().getPreferences("UseLogBrowser"): | 2214 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 2211 from .HgLogBrowserDialog import HgLogBrowserDialog | 2215 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 2212 self.logBrowser = \ | 2216 self.logBrowser = \ |
| 2213 HgLogBrowserDialog(self, mode="incoming", bundle=file) | 2217 HgLogBrowserDialog(self, mode="incoming", bundle=file) |
| 2214 self.logBrowser.show() | 2218 self.logBrowser.show() |
| 2235 return | 2239 return |
| 2236 | 2240 |
| 2237 file = E5FileDialog.getOpenFileName( | 2241 file = E5FileDialog.getOpenFileName( |
| 2238 None, | 2242 None, |
| 2239 self.trUtf8("Preview changegroup"), | 2243 self.trUtf8("Preview changegroup"), |
| 2240 repodir, | 2244 self.__lastChangeGroupPath or repodir, |
| 2241 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 2245 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 2242 if file: | 2246 if file: |
| 2247 self.__lastChangeGroupPath = os.path.dirname(self.__lastChangeGroupPath) | |
| 2248 | |
| 2243 args = [] | 2249 args = [] |
| 2244 args.append('identify') | 2250 args.append('identify') |
| 2245 args.append(file) | 2251 args.append(file) |
| 2246 | 2252 |
| 2247 dia = HgDialog(self.trUtf8('Identifying changegroup file'), self) | 2253 dia = HgDialog(self.trUtf8('Identifying changegroup file'), self) |
| 2268 | 2274 |
| 2269 res = False | 2275 res = False |
| 2270 files = E5FileDialog.getOpenFileNames( | 2276 files = E5FileDialog.getOpenFileNames( |
| 2271 None, | 2277 None, |
| 2272 self.trUtf8("Apply changegroups"), | 2278 self.trUtf8("Apply changegroups"), |
| 2273 repodir, | 2279 self.__lastChangeGroupPath or repodir, |
| 2274 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 2280 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 2275 if files: | 2281 if files: |
| 2282 self.__lastChangeGroupPath = os.path.dirname(files[0]) | |
| 2283 | |
| 2276 update = E5MessageBox.yesNo(self.__ui, | 2284 update = E5MessageBox.yesNo(self.__ui, |
| 2277 self.trUtf8("Apply changegroups"), | 2285 self.trUtf8("Apply changegroups"), |
| 2278 self.trUtf8("""Shall the working directory be updated?"""), | 2286 self.trUtf8("""Shall the working directory be updated?"""), |
| 2279 yesDefault=True) | 2287 yesDefault=True) |
| 2280 | 2288 |
