Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

Merge with stable

Changeset 291f63059ff4…

Parents d9a487705a3f…

Parents 6fb8c70dd82e…

by Steve Borho

Changes to 3 files · Browse files at 291f63059ff4 Showing diff from parent d9a487705a3f 6fb8c70dd82e Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
69
70
71
72
 
73
74
75
 
69
70
71
 
72
73
74
75
@@ -69,7 +69,7 @@
 Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt  Source: icons\thg_logo.ico; DestDir: {app}  Source: ..\misc\hgbook.pdf; DestDir: {app}/docs -Source: ..\misc\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete +Source: ..\misc\ThgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete  Source: ..\misc\ThgShellx64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete    [INI]
Change 1 of 1 Show Entire File doc/​TODO Stacked
 
1
2
3
4
5
6
7
8
 
 
 
1
2
 
 
 
3
@@ -1,8 +1,3 @@
-Update context menu screenshot -Add links to BB wiki and Mercurial wiki  Describe path editing and [auth] hgrc section  Need a page explaining merges and merge undo (tie together various parts) -nautilus cmenu configuration -hgignore dialog (including screenshot) -guess renames dialog (including screenshot)  Describe how to use hgfold to correct case-folding conflicts
Change 1 of 4 Show Entire File hggtk/​commit.py Stacked
 
416
417
418
419
 
420
421
422
 
473
474
475
 
 
476
477
478
 
608
609
610
611
612
613
614
615
616
617
618
619
620
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
621
622
623
 
725
726
727
728
 
729
730
731
 
416
417
418
 
419
420
421
422
 
473
474
475
476
477
478
479
480
 
610
611
612
 
 
 
 
 
 
 
 
 
 
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
 
732
733
734
 
735
736
737
738
@@ -416,7 +416,7 @@
  # pre-fill commit message, if not modified   buf = self.text.get_buffer()   if not buf.get_modified(): - buf.set_text(_('merge')) + buf.set_text(_('Merge '))   buf.set_modified(False)     @@ -473,6 +473,8 @@
  self.commit_selected(commit_list)   elif len(self.filemodel) == 0 and self.qnew:   self.commit_selected([]) + elif self.closebranch: + self.commit_selected([])   else:   gdialog.Prompt(_('Nothing Commited'),   _('No committable files selected'), self).run() @@ -608,16 +610,21 @@
  def should_addremove(self, files):   if self.test_opt('addremove'):   return True - else: - response = gdialog.Confirm(_('Confirm Add/Remove'), - files, self,_('Add/Remove the following files?')).run() - if response == gtk.RESPONSE_YES: - # This will stay set for further commits (meaning no - # more prompts). Problem? - self.opts['addremove'] = True - return True - return False - + response = gdialog.Confirm(_('Confirm Add/Remove'), + files, self,_('Add/Remove the following files?')).run() + if response != gtk.RESPONSE_YES: + return False + # This will stay set for further commits (meaning no more + # prompts). Problem? + self.opts['addremove'] = True + if self.qnew or self.qheader is not None: + cmdline = ['hg', 'addremove', '--verbose'] + cmdline += [self.repo.wjoin(x) for x in files] + dialog = hgcmd.CmdDialog(cmdline, True) + dialog.set_transient_for(self) + dialog.run() + dialog.hide() + return True     def ready_message(self):   buf = self.text.get_buffer() @@ -725,7 +732,7 @@
  cmdline.append('--force')   elif self.qheader is not None:   cmdline[1] = 'qrefresh' - if self.opts['addremove']: + elif self.opts['addremove']:   cmdline += ['--addremove']   if self.opts['user']:   cmdline.extend(['--user', self.opts['user']])