Show More
@@ -1038,8 +1038,6 class queue(object): | |||||
1038 | inclsubs.append('.hgsubstate') |
|
1038 | inclsubs.append('.hgsubstate') | |
1039 | substatestate = repo.dirstate['.hgsubstate'] |
|
1039 | substatestate = repo.dirstate['.hgsubstate'] | |
1040 | if opts.get('include') or opts.get('exclude') or pats: |
|
1040 | if opts.get('include') or opts.get('exclude') or pats: | |
1041 | if inclsubs: |
|
|||
1042 | pats = list(pats or []) + inclsubs |
|
|||
1043 | match = scmutil.match(repo[None], pats, opts) |
|
1041 | match = scmutil.match(repo[None], pats, opts) | |
1044 | # detect missing files in pats |
|
1042 | # detect missing files in pats | |
1045 | def badfn(f, msg): |
|
1043 | def badfn(f, msg): |
@@ -94,32 +94,32 fn to create dirty subrepo | |||||
94 | handle subrepos safely on qnew |
|
94 | handle subrepos safely on qnew | |
95 |
|
95 | |||
96 | $ mkrepo repo-2499-qnew |
|
96 | $ mkrepo repo-2499-qnew | |
97 | $ testadd qnew -m0 0.diff |
|
97 | $ testadd qnew -X path:no-effect -m0 0.diff | |
98 | adding a |
|
98 | adding a | |
99 | % abort when adding .hgsub w/dirty subrepo |
|
99 | % abort when adding .hgsub w/dirty subrepo | |
100 | A .hgsub |
|
100 | A .hgsub | |
101 | A sub/a |
|
101 | A sub/a | |
102 | % qnew -m0 0.diff |
|
102 | % qnew -X path:no-effect -m0 0.diff | |
103 | abort: uncommitted changes in subrepository sub |
|
103 | abort: uncommitted changes in subrepository sub | |
104 | [255] |
|
104 | [255] | |
105 | % update substate when adding .hgsub w/clean updated subrepo |
|
105 | % update substate when adding .hgsub w/clean updated subrepo | |
106 | A .hgsub |
|
106 | A .hgsub | |
107 | % qnew -m0 0.diff |
|
107 | % qnew -X path:no-effect -m0 0.diff | |
108 | path sub |
|
108 | path sub | |
109 | source sub |
|
109 | source sub | |
110 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
|
110 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 | |
111 |
|
111 | |||
112 | $ testmod qnew -m1 1.diff |
|
112 | $ testmod qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff | |
113 | adding a |
|
113 | adding a | |
114 | % abort when modifying .hgsub w/dirty subrepo |
|
114 | % abort when modifying .hgsub w/dirty subrepo | |
115 | M .hgsub |
|
115 | M .hgsub | |
116 | A sub2/a |
|
116 | A sub2/a | |
117 | % qnew -m1 1.diff |
|
117 | % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff | |
118 | abort: uncommitted changes in subrepository sub2 |
|
118 | abort: uncommitted changes in subrepository sub2 | |
119 | [255] |
|
119 | [255] | |
120 | % update substate when modifying .hgsub w/clean updated subrepo |
|
120 | % update substate when modifying .hgsub w/clean updated subrepo | |
121 | M .hgsub |
|
121 | M .hgsub | |
122 | % qnew -m1 1.diff |
|
122 | % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff | |
123 | path sub |
|
123 | path sub | |
124 | source sub |
|
124 | source sub | |
125 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
|
125 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
General Comments 0
You need to be logged in to leave comments.
Login now