Show More
@@ -1063,7 +1063,7 b' class committablectx(basectx):' | |||||
1063 | orig = copied.get(f, f) |
|
1063 | orig = copied.get(f, f) | |
1064 | man[f] = getman(orig).get(orig, nullid) + i |
|
1064 | man[f] = getman(orig).get(orig, nullid) + i | |
1065 | try: |
|
1065 | try: | |
1066 | man.set(f, ff(f)) |
|
1066 | man.setflag(f, ff(f)) | |
1067 | except OSError: |
|
1067 | except OSError: | |
1068 | pass |
|
1068 | pass | |
1069 |
|
1069 | |||
@@ -1389,7 +1389,7 b' class workingctx(committablectx):' | |||||
1389 | modified, added, removed = s[0:3] |
|
1389 | modified, added, removed = s[0:3] | |
1390 | for f in modified + added: |
|
1390 | for f in modified + added: | |
1391 | mf[f] = None |
|
1391 | mf[f] = None | |
1392 | mf.set(f, self.flags(f)) |
|
1392 | mf.setflag(f, self.flags(f)) | |
1393 | for f in removed: |
|
1393 | for f in removed: | |
1394 | if f in mf: |
|
1394 | if f in mf: | |
1395 | del mf[f] |
|
1395 | del mf[f] |
@@ -1407,7 +1407,7 b' class localrepository(object):' | |||||
1407 | added.append(f) |
|
1407 | added.append(f) | |
1408 | m[f] = self._filecommit(fctx, m1, m2, linkrev, |
|
1408 | m[f] = self._filecommit(fctx, m1, m2, linkrev, | |
1409 | trp, changed) |
|
1409 | trp, changed) | |
1410 | m.set(f, fctx.flags()) |
|
1410 | m.setflag(f, fctx.flags()) | |
1411 | except OSError, inst: |
|
1411 | except OSError, inst: | |
1412 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
1412 | self.ui.warn(_("trouble committing %s!\n") % f) | |
1413 | raise |
|
1413 | raise |
@@ -21,7 +21,8 b' class manifestdict(dict):' | |||||
21 | return self._flags.get(f, "") |
|
21 | return self._flags.get(f, "") | |
22 | def withflags(self): |
|
22 | def withflags(self): | |
23 | return set(self._flags.keys()) |
|
23 | return set(self._flags.keys()) | |
24 | def set(self, f, flags): |
|
24 | def setflag(self, f, flags): | |
|
25 | """Set the flags (symlink, executable) for path f.""" | |||
25 | self._flags[f] = flags |
|
26 | self._flags[f] = flags | |
26 | def copy(self): |
|
27 | def copy(self): | |
27 | return manifestdict(self, dict.copy(self._flags)) |
|
28 | return manifestdict(self, dict.copy(self._flags)) |
General Comments 0
You need to be logged in to leave comments.
Login now