Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 5df8bcb46c23…

Parents c969f014c035…

Parents de4a2cbd7d05…

by Steve Borho

Changes to 2 files · Browse files at 5df8bcb46c23 Showing diff from parent c969f014c035 de4a2cbd7d05 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​bugreport.py Stacked
 
132
133
134
135
 
136
137
138
 
132
133
134
 
135
136
137
138
@@ -132,7 +132,7 @@
  values = opts.get('values', [])   msgopts = {}   for i, val in enumerate(values): - msgopts['arg' + str(i)] = Qt.escape(val) + msgopts['arg' + str(i)] = Qt.escape(hglib.tounicode(val))   try:   text = text % msgopts   except Exception, e:
Change 1 of 2 Show Entire File tortoisehg/​util/​patchctx.py Stacked
 
35
36
37
38
39
40
41
 
53
54
55
 
56
57
58
 
35
36
37
 
38
39
40
 
52
53
54
55
56
57
58
@@ -35,7 +35,6 @@
  self._status = [[], [], []]   self._fileorder = []   self._user = '' - self._date = ''   self._desc = ''   self._branch = ''   self._node = node.nullid @@ -53,6 +52,7 @@
  hash.update(str(self._mtime))   self._identity = hash.digest()   except EnvironmentError: + self._date = util.makedate()   return     try: