Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 11109
- 3de1710db709
- parent 11090
- f5f5f5803935
- child 11148
- 15e30f0c76a8
equal
deleted
inserted
replaced
| 11108:62f50b72fbb7 | 11109:3de1710db709 |
|---|---|
| 1819 self.logBrowserOutgoing = HgLogBrowserDialog(self, mode="outgoing") | 1819 self.logBrowserOutgoing = HgLogBrowserDialog(self, mode="outgoing") |
| 1820 self.logBrowserOutgoing.show() | 1820 self.logBrowserOutgoing.show() |
| 1821 self.logBrowserOutgoing.raise_() | 1821 self.logBrowserOutgoing.raise_() |
| 1822 self.logBrowserOutgoing.start() | 1822 self.logBrowserOutgoing.start() |
| 1823 | 1823 |
| 1824 def hgPull(self, revisions=None): | 1824 def hgPull(self, revisions=None, noupdate=False): |
| 1825 """ | 1825 """ |
| 1826 Public method used to pull changes from a remote Mercurial repository. | 1826 Public method used to pull changes from a remote Mercurial repository. |
| 1827 | 1827 |
| 1828 @param revisions list of revisions to be pulled | 1828 @param revisions list of revisions to be pulled (defaults to None) |
| 1829 @type list of str | 1829 @type list of str (optional) |
| 1830 @param noupdate flag indicate to not update the working directory (defaults | |
| 1831 to False) | |
| 1832 @type bool (optional) | |
| 1830 @return flag indicating, that the update contained an add | 1833 @return flag indicating, that the update contained an add |
| 1831 or delete | 1834 or delete |
| 1832 @rtype bool | 1835 @rtype bool |
| 1833 """ | 1836 """ |
| 1834 if ( | 1837 if ( |
| 1843 command = "pull" | 1846 command = "pull" |
| 1844 title = self.tr("Pulling from a remote Mercurial repository") | 1847 title = self.tr("Pulling from a remote Mercurial repository") |
| 1845 | 1848 |
| 1846 args = self.initCommand(command) | 1849 args = self.initCommand(command) |
| 1847 args.append("-v") | 1850 args.append("-v") |
| 1848 if self.getPlugin().getPreferences("PullUpdate"): | 1851 if self.getPlugin().getPreferences("PullUpdate") and not noupdate: |
| 1849 args.append("--update") | 1852 args.append("--update") |
| 1850 if command == "unbundle": | 1853 if command == "unbundle": |
| 1851 args.append(self.bundleFile) | 1854 args.append(self.bundleFile) |
| 1852 if revisions: | 1855 if revisions: |
| 1853 for rev in revisions: | 1856 for rev in revisions: |
