Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

fogcreek Merge with stable

Changeset f5b67942a105…

Parents f9b94afe3cd7…

Parents a7860cebab42…

by David Golub

Changes to 3 files · Browse files at f5b67942a105 Showing diff from parent f9b94afe3cd7 a7860cebab42 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
685
686
687
688
689
 
 
690
691
692
693
694
695
696
 
697
698
699
 
743
744
745
746
 
747
748
749
 
786
787
788
 
789
790
791
 
685
686
687
 
 
688
689
690
691
692
693
694
695
 
696
697
698
699
 
743
744
745
 
746
747
748
749
 
786
787
788
789
790
791
792
@@ -685,15 +685,15 @@
  self.repo)   if commandlines is None:   return - files = self.stwidget.getChecked('MAR?!S') - if not (files or brcmd or newbranch): + self.files = self.stwidget.getChecked('MAR?!S') + if not (self.files or brcmd or newbranch):   qtlib.WarningMsgBox(_('No files checked'),   _('No modified files checkmarked for commit'),   parent=self)   self.stwidget.tv.setFocus()   return   if len(repo.parents()) > 1: - files = [] + self.files = []     user = qtlib.getCurrentUsername(self, self.repo, self.opts)   if not user: @@ -743,7 +743,7 @@
  dcmd = []   cmdline = ['commit', '--repository', repo.root, '--verbose',   '--user', user, '--message='+msg] - cmdline += dcmd + brcmd + [repo.wjoin(f) for f in files] + cmdline += dcmd + brcmd + [repo.wjoin(f) for f in self.files]   if len(repo.parents()) == 1:   for fname in self.opts.get('autoinc', '').split(','):   fname = fname.strip() @@ -786,6 +786,7 @@
  self.addMessageToHistory(umsg)   self.setMessage('')   if self.currentAction == 'commit': + shlib.shell_notify(self.files)   self.commitComplete.emit()    class DetailsDialog(QDialog):
Show Entire File tortoisehg/​util/​shlib.py Stacked
(No changes)
Change 1 of 1 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
16
17
18
 
 
 
 
19
20
 
21
22
23
 
16
17
18
19
20
21
22
23
 
24
25
26
27
@@ -16,8 +16,12 @@
  <?endif?>     <?define ProgramRegKey = Software\TortoiseHg ?> + + <?ifndef ProductName ?> + <?define ProductName = TortoiseHg ?> + <?endif?>   - <Product Name='TortoiseHg $(var.Version) ($(var.Platform))' + <Product Name='$(var.ProductName) $(var.Version) ($(var.Platform))'   Id='$(var.ProductId)'   Version='$(var.Version)'   UpgradeCode='$(var.ProductUpgradeCode)'