Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 21abc2eee8a0…

Parents fdb3adb50fc6…

Parents 829f55c1ae49…

by Sune Foldager

Changes to 10 files · Browse files at 21abc2eee8a0 Showing diff from parent fdb3adb50fc6 829f55c1ae49 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​archive.py Stacked
 
226
227
228
 
229
230
231
 
226
227
228
229
230
231
232
@@ -226,6 +226,7 @@
  cmdline.append(rev)   cmdline.append('-t')   cmdline.append(type) + cmdline.append('--')   cmdline.append(hglib.fromutf(dest))     # start archiving
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
1020
1021
1022
1023
 
1024
1025
1026
 
1020
1021
1022
 
1023
1024
1025
1026
@@ -1020,7 +1020,7 @@
  (self.curfile, rev))   if dialog.run() == gtk.RESPONSE_NO:   return - cmdline = ['hg', 'revert', '--verbose', '--rev', str(rev), self.curfile] + cmdline = ['hg', 'revert', '--verbose', '--rev', str(rev), '--', self.curfile]   dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​clone.py Stacked
 
331
332
333
 
334
335
336
 
331
332
333
334
335
336
337
@@ -331,6 +331,7 @@
  cmdline.append('--verbose')   cmdline.append(hglib.fromutf(src))   if dest: + cmdline.append('--')   cmdline.append(hglib.fromutf(dest))     # start cloning
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
1021
1022
1023
1024
 
1025
1026
1027
 
1158
1159
1160
 
1161
1162
1163
 
1021
1022
1023
 
1024
1025
1026
1027
 
1158
1159
1160
1161
1162
1163
1164
@@ -1021,7 +1021,7 @@
  # prompts). Problem?   self.opts['addremove'] = True   if self.qnew or self.qheader is not None: - cmdline = ['hg', 'addremove', '--verbose'] + cmdline = ['hg', 'addremove', '--verbose', '--']   cmdline += [self.repo.wjoin(x) for x in files]   self.execute_command(cmdline, force=True)   return True @@ -1158,6 +1158,7 @@
  cmdline += ['--message', hglib.fromutf(self.opts['message'])]   if self.qnew:   cmdline += [hglib.fromutf(self.get_qnew_name())] + cmdline.append('--')   cmdline += files   if autopush:   cmdline = (cmdline, ['hg', 'push'])
Change 1 of 6 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1732
1733
1734
1735
 
1736
1737
1738
 
1928
1929
1930
1931
 
1932
1933
1934
 
2013
2014
2015
2016
 
2017
2018
2019
 
2359
2360
2361
 
2362
2363
2364
 
2600
2601
2602
2603
 
2604
2605
 
2606
2607
2608
 
2631
2632
2633
2634
 
2635
2636
2637
 
1732
1733
1734
 
1735
1736
1737
1738
 
1928
1929
1930
 
1931
1932
1933
1934
 
2013
2014
2015
 
2016
2017
2018
2019
 
2359
2360
2361
2362
2363
2364
2365
 
2601
2602
2603
 
2604
2605
2606
2607
2608
2609
2610
 
2633
2634
2635
 
2636
2637
2638
2639
@@ -1732,7 +1732,7 @@
  # load the rebase extension explicitly   hglib.loadextension(self.ui, 'rebase')   - cmdline = ['hg'] + cmd + [self.bfile] + cmdline = ['hg'] + cmd + ['--', self.bfile]     def callback(return_code, *args):   self.remove_overlay('--rebase' in cmd) @@ -1928,7 +1928,7 @@
  self).run()   self.pathentry.grab_focus()   return - cmdline = ['hg'] + cmd + self.get_proxy_args() + [remote_path] + cmdline = ['hg'] + cmd + self.get_proxy_args() + ['--', remote_path]     def callback(return_code, *args):   if return_code == 0: @@ -2013,7 +2013,7 @@
  cmdline = ['hg', 'push'] + self.get_proxy_args()   if self.forcepush:   cmdline += ['--force'] - cmdline += [remote_path] + cmdline += ['--', remote_path]     def callback(return_code, *args):   if return_code == 0: @@ -2359,6 +2359,7 @@
  status = _('Bundling from %(base)s to %(rev)s...') % data   else:   status = _('Bundling from %(base)s to tip...') % data + cmdline.append('--')   cmdline.append(result)     def callback(return_code, *args): @@ -2600,9 +2601,10 @@
    node = self.repo[self.currevid].node()   rev = str(self.currevid) - cmdline = ['hg', 'push', '--rev', rev, remote_path] + cmdline = ['hg', 'push', '--rev', rev]   if self.forcepush:   cmdline += ['--force'] + cmdline += ['--', remote_path]     def callback(return_code, *args):   if return_code == 0: @@ -2631,7 +2633,7 @@
    def pull_to(self, menuitem):   rev = str(self.currevid) - cmdline = ['hg', 'pull', '--rev', rev, self.bfile] + cmdline = ['hg', 'pull', '--rev', rev, '--', self.bfile]     def callback(return_code, *args):   if return_code == 0:
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​quickop.py Stacked
 
237
238
239
240
 
241
242
 
 
243
244
245
 
237
238
239
 
240
241
242
243
244
245
246
247
@@ -237,9 +237,11 @@
  return     # prepare command line - cmdline = ['hg', self.command, '--verbose'] + list + cmdline = ['hg', self.command, '--verbose']   if hasattr(self, 'nobackup') and self.nobackup.get_active():   cmdline.append('--no-backup') + cmdline.append('--') + cmdline += list     # execute command   self.execute_command(cmdline, list)
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​synch.py Stacked
 
553
554
555
556
 
557
558
559
 
553
554
555
 
556
557
558
559
@@ -553,7 +553,7 @@
  cmdline += ['--verbose']   if proxy_host and not use_proxy:   cmdline += ["--config", "http_proxy.host="] - cmdline += [remote_path] + cmdline += ['--', remote_path]   self.lastcmd = cmdline     # show command to be executed
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
 
1010
1011
1012
1013
 
1014
1015
1016
 
1010
1011
1012
 
1013
1014
1015
1016
@@ -1010,7 +1010,7 @@
  return   if testpath[0] == '~':   testpath = os.path.expanduser(testpath) - cmdline = ['hg', 'incoming', '--verbose', testpath] + cmdline = ['hg', 'incoming', '--verbose', '--', testpath]   dlg = hgcmd.CmdDialog(cmdline, text='hg incoming')   dlg.run()   dlg.hide()
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgimport.py Stacked
 
341
342
343
344
 
345
346
347
 
341
342
343
 
344
345
346
347
@@ -341,7 +341,7 @@
  raise _('unexpected destination name: %s') % dest     # prepare command line - cmdline = ['hg', cmd, '--verbose'] + cmdline = ['hg', cmd, '--verbose', '--']   cmdline.extend(files)     # start importing
Change 1 of 4 Show Entire File tortoisehg/​hgtk/​thgmq.py Stacked
 
298
299
300
301
 
302
303
304
 
358
359
360
361
 
362
363
 
 
364
365
366
 
374
375
376
377
 
378
379
380
 
448
449
450
451
 
452
453
454
 
298
299
300
 
301
302
303
304
 
358
359
360
 
361
362
363
364
365
366
367
368
 
376
377
378
 
379
380
381
382
 
450
451
452
 
453
454
455
456
@@ -298,7 +298,7 @@
  """   if not self.is_operable():   return - cmdline = ['hg', 'qgoto', patch] + cmdline = ['hg', 'qgoto', '--', patch]   self.cmd.execute(cmdline, self.cmd_done)     def qpop(self, all=False): @@ -358,9 +358,11 @@
  keep = True   else:   return - cmdline = ['hg', 'qdelete'] + unapplied + cmdline = ['hg', 'qdelete']   if keep:   cmdline.append('--keep') + cmdline.append('--') + cmdline.extned(unapplied)   self.cmd.execute(cmdline, self.cmd_done, noemit=True)     def qrename(self, name, patch='qtip'): @@ -374,7 +376,7 @@
  """   if not name or not self.has_patch():   return - cmdline = ['hg', 'qrename', patch, name] + cmdline = ['hg', 'qrename', '--', patch, name]   self.cmd.execute(cmdline, self.cmd_done)     def qrename_ui(self, patch='qtip'): @@ -448,7 +450,7 @@
  " into the current patch '%(qtip)s'?") % data).run()   if ret != gtk.RESPONSE_YES:   return - cmdline = ['hg', 'qfold'] + unapplied + cmdline = ['hg', 'qfold', '--'] + unapplied   self.cmd.execute(cmdline, self.cmd_done)     def qreorder(self, patch, op):