Show More
@@ -1267,9 +1267,9 b' class queue(object):' | |||
|
1267 | 1267 | if any((b'.hgsubstate' in files for files in mar)): |
|
1268 | 1268 | return # already listed up |
|
1269 | 1269 | # not yet listed up |
|
1270 |
if substatestate |
|
|
1270 | if substatestate.added or not substatestate.any_tracked: | |
|
1271 | 1271 | mar[1].append(b'.hgsubstate') |
|
1272 |
elif substatestate |
|
|
1272 | elif substatestate.removed: | |
|
1273 | 1273 | mar[2].append(b'.hgsubstate') |
|
1274 | 1274 | else: # modified |
|
1275 | 1275 | mar[0].append(b'.hgsubstate') |
@@ -1377,7 +1377,7 b' class queue(object):' | |||
|
1377 | 1377 | self.checkpatchname(patchfn) |
|
1378 | 1378 | inclsubs = checksubstate(repo) |
|
1379 | 1379 | if inclsubs: |
|
1380 |
substatestate = repo.dirstate |
|
|
1380 | substatestate = repo.dirstate.get_entry(b'.hgsubstate') | |
|
1381 | 1381 | if opts.get(b'include') or opts.get(b'exclude') or pats: |
|
1382 | 1382 | # detect missing files in pats |
|
1383 | 1383 | def badfn(f, msg): |
@@ -1908,7 +1908,7 b' class queue(object):' | |||
|
1908 | 1908 | |
|
1909 | 1909 | inclsubs = checksubstate(repo, patchparent) |
|
1910 | 1910 | if inclsubs: |
|
1911 |
substatestate = repo.dirstate |
|
|
1911 | substatestate = repo.dirstate.get_entry(b'.hgsubstate') | |
|
1912 | 1912 | |
|
1913 | 1913 | ph = patchheader(self.join(patchfn), self.plainmode) |
|
1914 | 1914 | diffopts = self.diffopts( |
General Comments 0
You need to be logged in to leave comments.
Login now