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

filedata: Detect unchanged subrepos

Changeset bb945ff79c3a…

Parent 32fb226fea81…

by Angel Ezquerra

Changes to one file · Browse files at bb945ff79c3a Showing diff from parent 32fb226fea81 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
107
108
109
 
 
 
 
110
111
112
 
127
128
129
 
 
 
 
 
 
 
 
 
130
131
132
 
134
135
136
137
138
139
 
140
141
142
 
145
146
147
148
149
150
 
151
152
153
 
204
205
206
 
207
208
209
 
107
108
109
110
111
112
113
114
115
116
 
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
 
147
148
149
 
 
 
150
151
152
153
 
156
157
158
 
 
 
159
160
161
162
 
213
214
215
216
217
218
219
@@ -107,6 +107,10 @@
  def genSubrepoRevChangedDescription(subrelpath, sfrom, sto):   """Generate a subrepository revision change description"""   out = [] + def getLog(_ui, srepo, opts): + _ui.pushbuffer() + commands.log(_ui, srepo, **opts) + return _ui.popbuffer()   opts = {'date':None, 'user':None, 'rev':[sfrom]}   subabspath = os.path.join(repo.root, subrelpath)   missingsub = not os.path.isdir(subabspath) @@ -127,6 +131,15 @@
  sstatedesc = 'removed'   out.append(_('Subrepo removed from repository.') + u'\n\n')   return out, sstatedesc + elif sfrom == sto: + sstatedesc = 'unchanged' + out.append(_('Subrepo was not changed.') + u'\n\n') + out.append(_('Subrepo state is:') + u'\n') + if missingsub: + out.append(hglib.tounicode(_('changeset: %s') % sfrom + '\n')) + else: + out.append(hglib.tounicode(getLog(_ui, srepo, opts))) + return out, sstatedesc   else:   sstatedesc = 'changed'   @@ -134,9 +147,7 @@
  if missingsub:   out.append(hglib.tounicode(_('changeset: %s') % sfrom + '\n'))   else: - _ui.pushbuffer() - commands.log(_ui, srepo, **opts) - out.append(hglib.tounicode(_ui.popbuffer())) + out.append(hglib.tounicode(getLog(_ui, srepo, opts)))     out.append(_('To:') + u'\n')   if missingsub: @@ -145,9 +156,7 @@
  stolog += _('Further subrepository revision information cannot be retrieved.') + '\n'   else:   opts['rev'] = [sto] - _ui.pushbuffer() - commands.log(_ui, srepo, **opts) - stolog = _ui.popbuffer() + stolog = getLog(_ui, srepo, opts)     if not stolog:   stolog = _('Initial revision') @@ -204,6 +213,7 @@
  sstatedesc = 'removed'   lbl = {   'changed': _('(is a changed sub-repository)'), + 'unchanged': _('(is an unchanged sub-repository)'),   'dirty': _('(is a dirty sub-repository)'),   'new': _('(is a new sub-repository)'),   'removed': _('(is a removed sub-repository)'),