Show More
@@ -470,8 +470,7 b' class workingctx(changectx):' | |||
|
470 | 470 | self._text = text |
|
471 | 471 | if date: |
|
472 | 472 | self._date = util.parsedate(date) |
|
473 |
|
|
|
474 | self._date = util.makedate() | |
|
473 | if user: | |
|
475 | 474 | self._user = user |
|
476 | 475 | if parents: |
|
477 | 476 | self._parents = [changectx(self._repo, p) for p in parents] |
@@ -504,6 +503,12 b' class workingctx(changectx):' | |||
|
504 | 503 | if name == '_status': |
|
505 | 504 | self._status = self._repo.status(unknown=True) |
|
506 | 505 | return self._status |
|
506 | elif name == '_user': | |
|
507 | self._user = self._repo.ui.username() | |
|
508 | return self._user | |
|
509 | elif name == '_date': | |
|
510 | self._date = util.makedate() | |
|
511 | return self._date | |
|
507 | 512 | if name == '_manifest': |
|
508 | 513 | self._buildmanifest() |
|
509 | 514 | return self._manifest |
@@ -968,6 +968,8 b' class localrepository(repo.repository):' | |||
|
968 | 968 | if working: # we need to scan the working dir |
|
969 | 969 | s = self.dirstate.status(match, listignored, listclean, listunknown) |
|
970 | 970 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
|
971 | removed.sort() | |
|
972 | deleted.sort() | |
|
971 | 973 | |
|
972 | 974 | # check for any possibly clean files |
|
973 | 975 | if parentworking and cmp: |
@@ -1003,9 +1005,9 b' class localrepository(repo.repository):' | |||
|
1003 | 1005 | # we are comparing working dir against non-parent |
|
1004 | 1006 | # generate a pseudo-manifest for the working dir |
|
1005 | 1007 | mf2 = mfmatches(self['.']) |
|
1006 | mf2.flags = ctx2.flags # delay flag lookup | |
|
1007 | 1008 | for f in cmp + modified + added: |
|
1008 | 1009 | mf2[f] = None |
|
1010 | mf2.set(f, ctx2.flags(f)) | |
|
1009 | 1011 | for f in removed: |
|
1010 | 1012 | if f in mf2: |
|
1011 | 1013 | del mf2[f] |
@@ -1017,9 +1019,9 b' class localrepository(repo.repository):' | |||
|
1017 | 1019 | modified, added, clean = [], [], [] |
|
1018 | 1020 | for fn in util.sort(mf2): |
|
1019 | 1021 | if fn in mf1: |
|
1020 |
if (( |
|
|
1021 |
(mf2[fn] |
|
|
1022 | or mf1.flags(fn) != mf2.flags(fn)): | |
|
1022 | if (mf1.flags(fn) != mf2.flags(fn) or | |
|
1023 | (mf1[fn] != mf2[fn] and | |
|
1024 | (mf2[fn] or ctx1[fn].cmp(ctx2[fn].data())))): | |
|
1023 | 1025 | modified.append(fn) |
|
1024 | 1026 | elif listclean: |
|
1025 | 1027 | clean.append(fn) |
General Comments 0
You need to be logged in to leave comments.
Login now