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 a2e1273ee42d…

Parents 069cb81d9fd1…

Parents e7782fffe2a9…

by Steve Borho

Changes to 5 files · Browse files at a2e1273ee42d Showing diff from parent 069cb81d9fd1 e7782fffe2a9 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
22
23
24
25
 
 
26
27
28
 
22
23
24
 
25
26
27
28
29
@@ -22,7 +22,8 @@
    <?define VCRedistSrcDir = C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC ?>   - <Product Name='TortoiseHg $(var.Version)' Id='$(var.ProductId)' UpgradeCode='$(var.ProductUpgradeCode)' + <Product Name='TortoiseHg $(var.Version) ($(var.Platform))' + Id='$(var.ProductId)' UpgradeCode='$(var.ProductUpgradeCode)'   Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Steve Borho and others.'>     <Package Id='*' Keywords='Installer' Description="Windows shell extension for Mercurial DVCS (version $(var.Version))"
Change 1 of 1 Show Entire File doc/​source/​nonhg.txt Stacked
 
140
141
142
143
 
144
145
146
 
140
141
142
 
143
144
145
146
@@ -140,7 +140,7 @@
 * `hg-git Extension <http://mercurial.selenic.com/wiki/HgGit>`_ wiki page  * `Mercurial for Git users <http://mercurial.selenic.com/wiki/GitConcepts>`_   -hg-git, as it's name implies, allows you to use Mercurial as a +hg-git, as its name implies, allows you to use Mercurial as a  client to a git server. It can also be used to do straight conversions  of Git repositories into Mercurial.  
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
528
529
530
531
532
533
 
 
 
 
 
 
 
 
 
 
 
 
534
535
536
 
528
529
530
 
 
 
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
@@ -528,9 +528,18 @@
  try:   hashes = line.split(' ')   changelist = hashes.pop(0) - if changelist == 'submitted': - changelist = _('Submitted') + str(submitted) - submitted += 1 + if len(hashes)>1 and len(hashes[0])==1: + state = hashes.pop(0) + if state == 's': + changelist = _('%s (submitted)') % changelist + elif state == 'p': + changelist = _('%s (pending)') % changelist + else: + if changelist == 'submitted': + changelist = _('Submitted') + str(submitted) + submitted += 1 + else: + changelist = _('%s (pending)') % changelist   pending[changelist] = hashes   except (ValueError, IndexError):   text = _('Unable to parse p4pending output')
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​treeview.py Stacked
 
365
366
367
 
 
 
 
 
 
 
 
368
369
370
 
365
366
367
368
369
370
371
372
373
374
375
376
377
378
@@ -365,6 +365,14 @@
  else:   self.next_revision_batch(self.batchsize)   + try: + ctx = self.repo[revid] + if ctx.rev() == -1: + self.stbar.set_text('Null changeset is not viewable') + return + except Exception, e: + self.stbar.set_text(str(e)) + return   handler = self.connect('batch-loaded', loaded)   self.next_revision_batch(self.batchsize)  
Change 1 of 2 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
111
112
113
114
 
115
116
117
 
121
122
123
124
 
125
126
127
 
111
112
113
 
114
115
116
117
 
121
122
123
 
124
125
126
127
@@ -111,7 +111,7 @@
 };    const char* const RepoNoFilesMenu = - "commit status shelve vidff sep" + "commit status shelve vdiff sep"   " add revert rename forget remove sep"   " log update grep sep"   " synch serve clone init thgstatus sep" @@ -121,7 +121,7 @@
 ;    const char* const RepoFilesMenu = - "commit status vidff sep" + "commit status vdiff sep"   " add revert rename forget remove sep"   " log datamine sep"   " about"