Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py

branch
5_4_x
changeset 3252
8dfa2a7e936d
parent 3248
38d32752025c
child 3266
d792451dd0fc
equal deleted inserted replaced
3248:38d32752025c 3252:8dfa2a7e936d
177 out, err = self.__hgClient.runcommand(preargs) 177 out, err = self.__hgClient.runcommand(preargs)
178 else: 178 else:
179 err = "" 179 err = ""
180 if err: 180 if err:
181 self.__showError(err) 181 self.__showError(err)
182 elif os.path.exists(self.vcs.bundleFile): 182 elif self.mode != "incoming" or \
183 os.path.exists(self.vcs.bundleFile):
183 out, err = self.__hgClient.runcommand(args) 184 out, err = self.__hgClient.runcommand(args)
184 if err: 185 if err:
185 self.__showError(err) 186 self.__showError(err)
186 if out and self.isVisible(): 187 if out and self.isVisible():
187 for line in out.splitlines(True): 188 for line in out.splitlines(True):

eric ide

mercurial