Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc4, 0.4, and 0.4.1

synch: activate target revision option

Appearred to have been completely ignored since creation.
Refactored handling of advanced options along the way.

Changeset e27dd7342f68…

Parent c4dbad3229dc…

by TK Soh

Changes to one file · Browse files at e27dd7342f68 Showing diff from parent c4dbad3229dc Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​synch.py Stacked
 
347
348
349
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
350
351
 
352
353
354
355
 
356
357
358
359
 
360
361
362
 
363
364
365
 
 
366
367
368
 
400
401
402
 
403
404
405
406
407
408
409
410
411
 
 
 
 
 
412
413
414
 
415
416
417
418
419
420
421
422
423
 
 
 
 
 
424
425
426
 
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
 
 
376
377
378
379
380
381
 
 
382
383
384
385
386
 
418
419
420
421
422
 
 
 
 
 
 
 
 
423
424
425
426
427
428
429
430
431
432
 
 
 
 
 
 
 
 
433
434
435
436
437
438
439
440
@@ -347,22 +347,40 @@
  tbutton.set_tooltip(self.tips, tip)   tbutton.connect('clicked', handler, userdata)   return tbutton + + def _get_advanced_options(self): + opts = {} + if self._showpatch.get_active(): + opts['patch'] = ['--patch'] + if self._nomerge.get_active(): + opts['no-merges'] = ['--no-merges'] + if self._force.get_active(): + opts['force'] = ['--force'] + if self._newestfirst.get_active(): + opts['newest-first'] = ['--newest-first'] + target_rev = self._reventry.get_text().strip() + if target_rev != "": + opts['rev'] = ['--rev', target_rev] + + return opts     def _pull_clicked(self, toolbutton, data=None): + aopts = self._get_advanced_options()   if self._pull_fetch.get_active():   cmd = ['fetch', '--message', 'merge']   else:   cmd = ['pull'] + cmd += aopts.get('force', [])   if self._pull_update.get_active():   cmd.append('--update') - if self._force.get_active(): - cmd.append('--force') + cmd += aopts.get('rev', [])   self._exec_cmd(cmd)     def _push_clicked(self, toolbutton, data=None): + aopts = self._get_advanced_options()   cmd = ['push'] - if self._force.get_active(): - cmd.append('--force') + cmd += aopts.get('rev', []) + cmd += aopts.get('force', [])   self._exec_cmd(cmd)     def _conf_clicked(self, toolbutton, data=None): @@ -400,27 +418,23 @@
  dlg.set_transient_for(None)     def _incoming_clicked(self, toolbutton, data=None): + aopts = self._get_advanced_options()   cmd = ['incoming'] - if self._showpatch.get_active(): - cmd.append('--patch') - if self._nomerge.get_active(): - cmd.append('--no-merges') - if self._force.get_active(): - cmd.append('--force') - if self._newestfirst.get_active(): - cmd.append('--newest-first') + cmd += aopts.get('rev', []) + cmd += aopts.get('patch', []) + cmd += aopts.get('no-merges', []) + cmd += aopts.get('force', []) + cmd += aopts.get('newest-first', [])   self._exec_cmd(cmd)     def _outgoing_clicked(self, toolbutton, data=None): + aopts = self._get_advanced_options()   cmd = ['outgoing'] - if self._showpatch.get_active(): - cmd.append('--patch') - if self._nomerge.get_active(): - cmd.append('--no-merges') - if self._force.get_active(): - cmd.append('--force') - if self._newestfirst.get_active(): - cmd.append('--newest-first') + cmd += aopts.get('rev', []) + cmd += aopts.get('patch', []) + cmd += aopts.get('no-merges', []) + cmd += aopts.get('force', []) + cmd += aopts.get('newest-first', [])   self._exec_cmd(cmd)     def _stop_clicked(self, toolbutton, data=None):