Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.6, 0.7, and 0.7.1

changeset: use newer gitmode dictionary - fix display of A,R files

Changeset c08cec467669

Parent c3ed517e2794

by Steve Borho

Changes to one file · Browse files at c08cec467669 Showing diff from parent c3ed517e2794 Diff from another changeset...

 
307
308
309
 
310
311
312
 
320
321
322
323
324
325
326
327
328
329
330
331
 
332
333
334
 
335
336
337
 
349
350
351
352
 
353
354
355
356
 
 
357
358
359
 
307
308
309
310
311
312
313
 
321
322
323
 
 
324
325
326
327
328
329
 
330
331
332
 
333
334
335
336
 
348
349
350
 
351
352
353
 
 
354
355
356
357
358
@@ -307,6 +307,7 @@
  copied[f] = src     srcs = [x[1] for x in copied.iteritems() if filestatus(x[0]) == 'A'] + gitmode = {'l': '120000', 'x': '100755', '': '100644'}     gone = {}   for f in filelist: @@ -320,18 +321,16 @@
  if s != 'R':   tn = getfilectx(f, ctx2).data()   a, b = f, f - def gitmode(flags): - return 'l' in flags or 'x' in flags   def addmodehdr(header, omode, nmode):   if omode != nmode:   header.append('old mode %s\n' % omode)   header.append('new mode %s\n' % nmode)     if s == 'A': - mode = gitmode(flags2(f)) + mode = gitmode[flags2(f)]   if f in copied:   a = copied[f] - omode = gitmode(man1.flags(a)) + omode = gitmode[man1.flags(a)]   addmodehdr(header, omode, mode)   if filestatus(a) == 'R' and a not in gone:   op = 'rename' @@ -349,11 +348,11 @@
  if f in srcs:   dodiff = False   else: - mode = gitmode(man1.flags(f)) + mode = gitmode[man1.flags(f)]   header.append('deleted file mode %s\n' % mode)   else: - omode = gitmode(man1.flags(f)) - nmode = gitmode(flags2(f)) + omode = gitmode[man1.flags(f)] + nmode = gitmode[flags2(f)]   addmodehdr(header, omode, nmode)   if util.binary(to) or util.binary(tn):   dodiff = 'binary'