Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 297:0dbcf3c9ff20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed usage of removed variable 'wp'.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 09 Jun 2005 08:53:07 +0100
parents 09364bcebdf0
children 91c9fd6a7c70
comparison
equal deleted inserted replaced
295:38919e1c254d 297:0dbcf3c9ff20
998 self.ui.note("getting %s\n" % f) 998 self.ui.note("getting %s\n" % f)
999 t = self.file(f).read(get[f]) 999 t = self.file(f).read(get[f])
1000 try: 1000 try:
1001 self.wfile(f, "w").write(t) 1001 self.wfile(f, "w").write(t)
1002 except IOError: 1002 except IOError:
1003 os.makedirs(os.path.dirname(wp)) 1003 os.makedirs(os.path.dirname(self.wjoin(f)))
1004 self.wfile(f, "w").write(t) 1004 self.wfile(f, "w").write(t)
1005 set_exec(self.wjoin(f), mf2[f]) 1005 set_exec(self.wjoin(f), mf2[f])
1006 self.dirstate.update([f], mode) 1006 self.dirstate.update([f], mode)
1007 1007
1008 # merge the tricky bits 1008 # merge the tricky bits
1010 files.sort() 1010 files.sort()
1011 for f in files: 1011 for f in files:
1012 self.ui.status("merging %s\n" % f) 1012 self.ui.status("merging %s\n" % f)
1013 m, o, flag = merge[f] 1013 m, o, flag = merge[f]
1014 self.merge3(f, m, o) 1014 self.merge3(f, m, o)
1015 set_exec(wp, flag) 1015 set_exec(self.wjoin(f), flag)
1016 self.dirstate.update([f], 'm') 1016 self.dirstate.update([f], 'm')
1017 1017
1018 for f in remove: 1018 for f in remove:
1019 self.ui.note("removing %s\n" % f) 1019 self.ui.note("removing %s\n" % f)
1020 os.unlink(f) 1020 os.unlink(f)