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

commit: use cleaner fix for permissions issue

Changeset 119729bc2d66…

Parent 6355bffa7c53…

by Steve Borho

Changes to one file · Browse files at 119729bc2d66 Showing diff from parent 6355bffa7c53 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​commit.py Stacked
 
11
12
13
14
15
16
17
 
315
316
317
318
319
320
321
322
323
324
325
326
327
 
 
 
328
329
330
 
11
12
13
 
14
15
16
 
314
315
316
 
 
 
317
318
319
320
321
322
 
323
324
325
326
327
328
@@ -11,7 +11,6 @@
 import errno  import gtk  import pango -import shutil  import tempfile  import cStringIO   @@ -315,16 +314,15 @@
  else:   # 3a. apply filtered patch to clean repo (clean)   hg.revert(repo, repo.dirstate.parents()[0], backups.has_key) - # Reapply permissions back to clean files - for realname, tmpname in backups.iteritems(): - shutil.copymode(tmpname, repo.wjoin(realname))     # 3b. (apply)   if dopatch:   try:   ui.debug(_('applying patch\n'))   ui.debug(fp.getvalue()) - patch.internalpatch(fp, ui, 1, repo.root) + pfiles = {} + patch.internalpatch(fp, ui, 1, repo.root, files=pfiles) + patch.updatedir(ui, repo, pfiles)   except patch.PatchError, err:   s = str(err)   if s: