Show More
@@ -1648,13 +1648,17 b' class gitsubrepo(abstractsubrepo):' | |||||
1648 | if match.anypats(): |
|
1648 | if match.anypats(): | |
1649 | return #No support for include/exclude yet |
|
1649 | return #No support for include/exclude yet | |
1650 |
|
1650 | |||
|
1651 | output = "" | |||
1651 | if match.always(): |
|
1652 | if match.always(): | |
1652 |
|
|
1653 | output += self._gitcommand(cmd) + '\n' | |
1653 | elif match.files(): |
|
1654 | elif match.files(): | |
1654 | for f in match.files(): |
|
1655 | for f in match.files(): | |
1655 |
|
|
1656 | output += self._gitcommand(cmd + [f]) + '\n' | |
1656 | elif match(gitprefix): #Subrepo is matched |
|
1657 | elif match(gitprefix): #Subrepo is matched | |
1657 |
|
|
1658 | output += self._gitcommand(cmd) + '\n' | |
|
1659 | ||||
|
1660 | if output.strip(): | |||
|
1661 | ui.write(output) | |||
1658 |
|
1662 | |||
1659 | @annotatesubrepoerror |
|
1663 | @annotatesubrepoerror | |
1660 | def revert(self, substate, *pats, **opts): |
|
1664 | def revert(self, substate, *pats, **opts): |
@@ -112,7 +112,7 b' clone root, make local change' | |||||
112 | @@ -1,2 +1,3 @@ |
|
112 | @@ -1,2 +1,3 @@ | |
113 | g |
|
113 | g | |
114 | gg |
|
114 | gg | |
115 | +ggg (no-eol) |
|
115 | +ggg | |
116 | $ hg commit --subrepos -m ggg |
|
116 | $ hg commit --subrepos -m ggg | |
117 | committing subrepository s |
|
117 | committing subrepository s | |
118 | $ hg debugsub |
|
118 | $ hg debugsub | |
@@ -695,7 +695,7 b' check differences made by most recent ch' | |||||
695 | +woopwoop |
|
695 | +woopwoop | |
696 | + |
|
696 | + | |
697 | +foo |
|
697 | +foo | |
698 | +bar (no-eol) |
|
698 | +bar | |
699 |
|
699 | |||
700 | $ hg commit --subrepos -m "Added foobar" |
|
700 | $ hg commit --subrepos -m "Added foobar" | |
701 | committing subrepository s |
|
701 | committing subrepository s | |
@@ -717,7 +717,7 b' check differences made by most recent ch' | |||||
717 | +woopwoop |
|
717 | +woopwoop | |
718 | + |
|
718 | + | |
719 | +foo |
|
719 | +foo | |
720 | +bar (no-eol) |
|
720 | +bar | |
721 |
|
721 | |||
722 | check output when only diffing the subrepository |
|
722 | check output when only diffing the subrepository | |
723 | $ hg diff -c . --subrepos s |
|
723 | $ hg diff -c . --subrepos s | |
@@ -730,7 +730,7 b' check output when only diffing the subre' | |||||
730 | +woopwoop |
|
730 | +woopwoop | |
731 | + |
|
731 | + | |
732 | +foo |
|
732 | +foo | |
733 | +bar (no-eol) |
|
733 | +bar | |
734 |
|
734 | |||
735 | check output when diffing something else |
|
735 | check output when diffing something else | |
736 | $ hg diff -c . --subrepos .hgsubstate --nodates |
|
736 | $ hg diff -c . --subrepos .hgsubstate --nodates | |
@@ -760,7 +760,7 b' add new changes, including whitespace' | |||||
760 | --- /dev/null |
|
760 | --- /dev/null | |
761 | +++ b/s/barfoo |
|
761 | +++ b/s/barfoo | |
762 | @@ -0,0 +1 @@ |
|
762 | @@ -0,0 +1 @@ | |
763 | +foo (no-eol) |
|
763 | +foo | |
764 | $ hg diff --subrepos s/foobar |
|
764 | $ hg diff --subrepos s/foobar | |
765 | diff --git a/s/foobar b/s/foobar |
|
765 | diff --git a/s/foobar b/s/foobar | |
766 | index 8a5a5e2..bd5812a 100644 |
|
766 | index 8a5a5e2..bd5812a 100644 | |
@@ -771,7 +771,7 b' add new changes, including whitespace' | |||||
771 | +woop woop |
|
771 | +woop woop | |
772 |
|
772 | |||
773 | foo |
|
773 | foo | |
774 | bar (no-eol) |
|
774 | bar | |
775 |
|
775 | |||
776 | execute a diffstat |
|
776 | execute a diffstat | |
777 | the output contains a regex, because git 1.7.10 and 1.7.11 |
|
777 | the output contains a regex, because git 1.7.10 and 1.7.11 | |
@@ -779,7 +779,7 b' the output contains a regex, because git' | |||||
779 | $ hg diff --subrepos --stat |
|
779 | $ hg diff --subrepos --stat | |
780 | \s*barfoo |\s*1 + (re) |
|
780 | \s*barfoo |\s*1 + (re) | |
781 | \s*foobar |\s*2 +- (re) |
|
781 | \s*foobar |\s*2 +- (re) | |
782 |
2 files changed, 2 insertions\(\+\), 1 deletions?\(-\) |
|
782 | 2 files changed, 2 insertions\(\+\), 1 deletions?\(-\) (re) | |
783 |
|
783 | |||
784 | ensure adding include/exclude ignores the subrepo |
|
784 | ensure adding include/exclude ignores the subrepo | |
785 | $ hg diff --subrepos -I s/foobar |
|
785 | $ hg diff --subrepos -I s/foobar |
General Comments 0
You need to be logged in to leave comments.
Login now