← Back to branch summary

~ubuntu-branches/debian/sid/tortoisehg/sid

« back to all changes in this revision

Viewing changes to tortoisehg/hgqt/quickop.py

  • Committer: Package Import Robot
  • Author(s): Ludovico Cavedon
  • Date: 2012-05-29 00:59:17 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20120529005917-ae1mdohuiimxxkc0
Tags: 2.4-1
http://bugs.debian.org/671473
https://launchpad.net/bugs/990527
* Imported Upstream version 2.4 (Closes: #671473).
* Re-add Nautilus extension (LP: #990527).
* Update Standards-Version to 3.9.3.
* Update copyright format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tortoisehg/hgqt/quickop.py
119
119
        if self.command == 'add':
120
120
            if 'largefiles' in self.repo.extensions():
121
121
                self.addLfilesButton = QPushButton(_('Add &Largefiles'))
122
 
            elif 'kbfiles' in self.repo.extensions():
123
 
                self.addLfilesButton = QPushButton(_("Add &Bfiles"))
124
122
            else:
125
123
                self.addLfilesButton = None
126
124
            if self.addLfilesButton:
200
198
                        pass
201
199
                    files.remove(wfile)
202
200
        elif self.command == 'add':
203
 
            if 'largefiles' in self.repo.extensions() or 'kbfiles' in self.repo.extensions():
 
201
            if 'largefiles' in self.repo.extensions():
204
202
                self.addWithPrompt(files)
205
203
                return
206
204
        if files:
227
225
            QDialog.reject(self)
228
226
 
229
227
    def addLfiles(self):
230
 
        if 'kbfiles' in self.repo.extensions():
231
 
            cmdline = ['add', '--bf']
232
 
        else:
 
228
        if 'largefiles' in self.repo.extensions():
233
229
            cmdline = ['add', '--large']
234
230
        files = self.stwidget.getChecked()
235
231
        if not files:
242
238
        self.cmd.run(cmdline)
243
239
 
244
240
    def addWithPrompt(self, files):
245
 
        result = lfprompt.promptForLfiles(self, self.repo.ui, self.repo, files,
246
 
                                          'kbfiles' in self.repo.extensions())
 
241
        result = lfprompt.promptForLfiles(self, self.repo.ui, self.repo, files)
247
242
        if not result:
248
243
            return
249
 
        files, bfiles = result
 
244
        files, lfiles = result
250
245
        if files:
251
246
            cmdline = ['add']
252
247
            cmdline.extend(files)
253
248
            self.files = files
254
249
            self.cmd.run(cmdline)
255
 
        if bfiles:
256
 
            if 'kbfiles' in self.repo.extensions():
257
 
                cmdline = ['add', '--bf']
258
 
            else:
 
250
        if lfiles:
 
251
            if 'largefiles' in self.repo.extensions():
259
252
                cmdline = ['add', '--large']
260
 
            cmdline.extend(bfiles)
261
 
            self.files = bfiles
 
253
            cmdline.extend(lfiles)
 
254
            self.files = lfiles
262
255
            self.cmd.run(cmdline)
263
256
 
264
257
instance = None