Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 181
- 4af57f97c1bc
- parent 178
- dd9f0bca5e2f
- child 182
- 5fb26c972892
equal
deleted
inserted
replaced
| 180:40ac468c2558 | 181:4af57f97c1bc |
|---|---|
| 1252 Public method used to view the log of incoming changes from the | 1252 Public method used to view the log of incoming changes from the |
| 1253 Mercurial repository. | 1253 Mercurial repository. |
| 1254 | 1254 |
| 1255 @param name file/directory name to show the log of (string) | 1255 @param name file/directory name to show the log of (string) |
| 1256 """ | 1256 """ |
| 1257 self.log = HgLogDialog(self, mode = "incoming") | 1257 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 1258 self.log.show() | 1258 self.logBrowser = HgLogBrowserDialog(self, mode = "incoming") |
| 1259 self.log.start(name) | 1259 self.logBrowser.show() |
| 1260 self.logBrowser.start(name) | |
| 1261 else: | |
| 1262 self.log = HgLogDialog(self, mode = "incoming") | |
| 1263 self.log.show() | |
| 1264 self.log.start(name) | |
| 1260 | 1265 |
| 1261 def hgOutgoing(self, name): | 1266 def hgOutgoing(self, name): |
| 1262 """ | 1267 """ |
| 1263 Public method used to view the log of outgoing changes from the | 1268 Public method used to view the log of outgoing changes from the |
| 1264 Mercurial repository. | 1269 Mercurial repository. |
| 1265 | 1270 |
| 1266 @param name file/directory name to show the log of (string) | 1271 @param name file/directory name to show the log of (string) |
| 1267 """ | 1272 """ |
| 1268 self.log = HgLogDialog(self, mode = "outgoing") | 1273 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 1269 self.log.show() | 1274 self.logBrowser = HgLogBrowserDialog(self, mode = "outgoing") |
| 1270 self.log.start(name) | 1275 self.logBrowser.show() |
| 1276 self.logBrowser.start(name) | |
| 1277 else: | |
| 1278 self.log = HgLogDialog(self, mode = "outgoing") | |
| 1279 self.log.show() | |
| 1280 self.log.start(name) | |
| 1271 | 1281 |
| 1272 def hgPull(self, name): | 1282 def hgPull(self, name): |
| 1273 """ | 1283 """ |
| 1274 Public method used to pull changes from a remote Mercurial repository. | 1284 Public method used to pull changes from a remote Mercurial repository. |
| 1275 | 1285 |
