Kiln » largefiles » Unity
Clone URL:  

status: handle subrepos properly

Changeset c3d0b45dc573…

Parent dbd5edcfc99f…

by Profile picture of User 521Andrew Pritchard <andrewp@fogcreek.com>

Changes to 2 files · Browse files at c3d0b45dc573 Showing diff from parent dbd5edcfc99f Diff from another changeset...

Change 1 of 2 Show Entire File reposetup.py Stacked
 
83
84
85
86
 
87
88
89
90
91
 
92
93
94
 
133
134
135
136
 
137
138
139
 
83
84
85
 
86
87
88
89
90
 
91
92
93
94
 
133
134
135
 
136
137
138
139
@@ -83,12 +83,12 @@
  # the listing. This function reverts to the original status if   # self.lfstatus is False   def status(self, node1='.', node2=None, match=None, ignored=False, - clean=False, unknown=False, subrepos=None): + clean=False, unknown=False, listsubrepos=False):   listignored, listclean, listunknown = ignored, clean, unknown   if not self.lfstatus:   try:   return super(lfiles_repo, self).status(node1, node2, match, - listignored, listclean, listunknown, subrepos) + listignored, listclean, listunknown, listsubrepos)   except TypeError:   return super(lfiles_repo, self).status(node1, node2, match,   listignored, listclean, listunknown) @@ -133,7 +133,7 @@
  # were not asked for   try:   result = super(lfiles_repo, self).status(node1, node2, m, - True, True, True, subrepos) + True, True, True, listsubrepos)   except TypeError:   result = super(lfiles_repo, self).status(node1, node2, m,   True, True, True)
Change 1 of 1 Show Entire File tests/​test-subrepos.t Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
@@ -0,0 +1,27 @@
+Setup + $ export LARGEFILES='--config extensions.largefiles=$TESTDIR/..' + $ export LHG="hg $LARGEFILES" + +status on largefiles repo with subrepo + $ $LHG init r1 + $ cd r1 + $ echo c1 > f1 + $ $LHG init sr1 + $ cd sr1 + $ echo c2 > f2 + $ $LHG add f2 + $ $LHG ci -m 'm1' + $ cd .. + $ $LHG add --large f1 + $ cat >> .hgsub <<! + > sr1 = sr1 + > ! + $ $LHG add .hgsub + $ $LHG ci -m 'm2' + committing subrepository sr1 + $ $LHG status + $ echo c1:1 > f1 + $ echo c2:1 > sr1/f2 + $ $LHG status -S + M f1 + M sr1/f2