Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1619:1ba0d7041ac4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Distinguish removed and deleted files. Tests are not fixed yet. hg status will now show "R filename" for "hg rm"ed files and "! filename" for files which were deleted manually. Manually deleted files are considered unmodified.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 12 Jan 2006 13:58:36 +0100
parents ff339dd21976
children ee16f06174bd
comparison
equal deleted inserted replaced
1618:ff339dd21976 1619:1ba0d7041ac4
353 elif s == 'r': 353 elif s == 'r':
354 remove.append(f) 354 remove.append(f)
355 else: 355 else:
356 self.ui.warn(_("%s not tracked!\n") % f) 356 self.ui.warn(_("%s not tracked!\n") % f)
357 else: 357 else:
358 modified, added, removed, unknown = self.changes(match=match) 358 modified, added, removed, deleted, unknown = self.changes(match=match)
359 commit = modified + added 359 commit = modified + added
360 remove = removed 360 remove = removed
361 361
362 p1, p2 = self.dirstate.parents() 362 p1, p2 = self.dirstate.parents()
363 c1 = self.changelog.read(p1) 363 c1 = self.changelog.read(p1)
542 else: 542 else:
543 added.append(fn) 543 added.append(fn)
544 544
545 removed = mf1.keys() 545 removed = mf1.keys()
546 546
547 removed.extend(deleted) #XXX get rid of this when returning deleted
548
549 # sort and return results: 547 # sort and return results:
550 for l in modified, added, removed, unknown: 548 for l in modified, added, removed, deleted, unknown:
551 l.sort() 549 l.sort()
552 return (modified, added, removed, unknown) 550 return (modified, added, removed, deleted, unknown)
553 551
554 def add(self, list): 552 def add(self, list):
555 wlock = self.wlock() 553 wlock = self.wlock()
556 for f in list: 554 for f in list:
557 p = self.wjoin(f) 555 p = self.wjoin(f)
1390 m2 = self.manifest.read(m2n) 1388 m2 = self.manifest.read(m2n)
1391 mf2 = self.manifest.readflags(m2n) 1389 mf2 = self.manifest.readflags(m2n)
1392 ma = self.manifest.read(man) 1390 ma = self.manifest.read(man)
1393 mfa = self.manifest.readflags(man) 1391 mfa = self.manifest.readflags(man)
1394 1392
1395 modified, added, removed, unknown = self.changes() 1393 modified, added, removed, deleted, unknown = self.changes()
1396 1394
1397 if allow and not forcemerge: 1395 if allow and not forcemerge:
1398 if modified or added or removed: 1396 if modified or added or removed:
1399 raise util.Abort(_("outstanding uncommited changes")) 1397 raise util.Abort(_("outstanding uncommited changes"))
1400 if not forcemerge and not force: 1398 if not forcemerge and not force:
1432 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) 1430 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False))
1433 1431
1434 if moddirstate: 1432 if moddirstate:
1435 wlock = self.wlock() 1433 wlock = self.wlock()
1436 1434
1437 for f in removed: 1435 for f in deleted:
1438 if f in mw: 1436 if f in mw:
1439 del mw[f] 1437 del mw[f]
1440 1438
1441 # If we're jumping between revisions (as opposed to merging), 1439 # If we're jumping between revisions (as opposed to merging),
1442 # and if neither the working directory nor the target rev has 1440 # and if neither the working directory nor the target rev has