Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/dirstate.py
changeset 7119 50f4e866d693
parent 7118 619ebf82cef2
child 7128 2b8a2248312a
equal deleted inserted replaced
7118:619ebf82cef2 7119:50f4e866d693 
   252     def normal(self, f):
 
   252     def normal(self, f):
 
   253         'mark a file normal and clean'
 
   253         'mark a file normal and clean'
 
   254         self._dirty = True
 
   254         self._dirty = True
 
   255         self._addpath(f)
 
   255         self._addpath(f)
 
   256         s = os.lstat(self._join(f))
 
   256         s = os.lstat(self._join(f))
 
   257         self._map[f] = ('n', s.st_mode, s.st_size, s.st_mtime)
 
   257         self._map[f] = ('n', s.st_mode, s.st_size, int(s.st_mtime))
 
   258         if f in self._copymap:
 
   258         if f in self._copymap:
 
   259             del self._copymap[f]
 
   259             del self._copymap[f]
 
   260 
   260 
   261     def normallookup(self, f):
 
   261     def normallookup(self, f):
 
   262         'mark a file normal, but possibly dirty'
 
   262         'mark a file normal, but possibly dirty'
 
   315     def merge(self, f):
 
   315     def merge(self, f):
 
   316         'mark a file merged'
 
   316         'mark a file merged'
 
   317         self._dirty = True
 
   317         self._dirty = True
 
   318         s = os.lstat(self._join(f))
 
   318         s = os.lstat(self._join(f))
 
   319         self._addpath(f)
 
   319         self._addpath(f)
 
   320         self._map[f] = ('m', s.st_mode, s.st_size, s.st_mtime)
 
   320         self._map[f] = ('m', s.st_mode, s.st_size, int(s.st_mtime))
 
   321         if f in self._copymap:
 
   321         if f in self._copymap:
 
   322             del self._copymap[f]
 
   322             del self._copymap[f]
 
   323 
   323 
   324     def forget(self, f):
 
   324     def forget(self, f):
 
   325         'forget a file'
 
   325         'forget a file'
mercurial