Show More
@@ -170,6 +170,7 b' def reposetup(ui, repo):' | |||||
170 | else: |
|
170 | else: | |
171 | tocheck = unsure + modified + added + clean |
|
171 | tocheck = unsure + modified + added + clean | |
172 | modified, added, clean = [], [], [] |
|
172 | modified, added, clean = [], [], [] | |
|
173 | checkexec = self.dirstate._checkexec | |||
173 |
|
174 | |||
174 | for lfile in tocheck: |
|
175 | for lfile in tocheck: | |
175 | standin = lfutil.standin(lfile) |
|
176 | standin = lfutil.standin(lfile) | |
@@ -177,7 +178,8 b' def reposetup(ui, repo):' | |||||
177 | abslfile = self.wjoin(lfile) |
|
178 | abslfile = self.wjoin(lfile) | |
178 | if ((ctx1[standin].data().strip() != |
|
179 | if ((ctx1[standin].data().strip() != | |
179 | lfutil.hashfile(abslfile)) or |
|
180 | lfutil.hashfile(abslfile)) or | |
180 |
( |
|
181 | (checkexec and | |
|
182 | ('x' in ctx1.flags(standin)) != | |||
181 | bool(lfutil.getexecutable(abslfile)))): |
|
183 | bool(lfutil.getexecutable(abslfile)))): | |
182 | modified.append(lfile) |
|
184 | modified.append(lfile) | |
183 | elif listclean: |
|
185 | elif listclean: |
@@ -577,6 +577,31 b' the working context)' | |||||
577 | $ hg status -A --rev '.^1' large2 |
|
577 | $ hg status -A --rev '.^1' large2 | |
578 | M large2 |
|
578 | M large2 | |
579 |
|
579 | |||
|
580 | #else | |||
|
581 | ||||
|
582 | Test that "hg status" against revisions other than parent ignores exec | |||
|
583 | bit correctly on the platform being unaware of it. | |||
|
584 | ||||
|
585 | $ hg update -q -C 4 | |||
|
586 | ||||
|
587 | $ cat > exec-bit.patch <<EOF | |||
|
588 | > # HG changeset patch | |||
|
589 | > # User test | |||
|
590 | > # Date 0 0 | |||
|
591 | > # Thu Jan 01 00:00:00 1970 +0000 | |||
|
592 | > # Node ID be1b433a65b12b27b5519d92213e14f7e1769b90 | |||
|
593 | > # Parent 07d6153b5c04313efb75deec9ba577de7faeb727 | |||
|
594 | > chmod +x large2 | |||
|
595 | > | |||
|
596 | > diff --git a/.hglf/large2 b/.hglf/large2 | |||
|
597 | > old mode 100644 | |||
|
598 | > new mode 100755 | |||
|
599 | > EOF | |||
|
600 | $ hg import --exact --bypass exec-bit.patch | |||
|
601 | applying exec-bit.patch | |||
|
602 | $ hg status -A --rev tip large2 | |||
|
603 | C large2 | |||
|
604 | ||||
580 | #endif |
|
605 | #endif | |
581 |
|
606 | |||
582 | $ cd .. |
|
607 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now