equal
deleted
inserted
replaced
1265 else: |
1265 else: |
1266 mar = (changes.modified, changes.added, changes.removed) |
1266 mar = (changes.modified, changes.added, changes.removed) |
1267 if any((b'.hgsubstate' in files for files in mar)): |
1267 if any((b'.hgsubstate' in files for files in mar)): |
1268 return # already listed up |
1268 return # already listed up |
1269 # not yet listed up |
1269 # not yet listed up |
1270 if substatestate in b'a?': |
1270 if substatestate.added or not substatestate.any_tracked: |
1271 mar[1].append(b'.hgsubstate') |
1271 mar[1].append(b'.hgsubstate') |
1272 elif substatestate in b'r': |
1272 elif substatestate.removed: |
1273 mar[2].append(b'.hgsubstate') |
1273 mar[2].append(b'.hgsubstate') |
1274 else: # modified |
1274 else: # modified |
1275 mar[0].append(b'.hgsubstate') |
1275 mar[0].append(b'.hgsubstate') |
1276 |
1276 |
1277 def checklocalchanges(self, repo, force=False, refresh=True): |
1277 def checklocalchanges(self, repo, force=False, refresh=True): |
1375 diffopts = self.diffopts({b'git': opts.get(b'git')}, plain=True) |
1375 diffopts = self.diffopts({b'git': opts.get(b'git')}, plain=True) |
1376 if opts.get(b'checkname', True): |
1376 if opts.get(b'checkname', True): |
1377 self.checkpatchname(patchfn) |
1377 self.checkpatchname(patchfn) |
1378 inclsubs = checksubstate(repo) |
1378 inclsubs = checksubstate(repo) |
1379 if inclsubs: |
1379 if inclsubs: |
1380 substatestate = repo.dirstate[b'.hgsubstate'] |
1380 substatestate = repo.dirstate.get_entry(b'.hgsubstate') |
1381 if opts.get(b'include') or opts.get(b'exclude') or pats: |
1381 if opts.get(b'include') or opts.get(b'exclude') or pats: |
1382 # detect missing files in pats |
1382 # detect missing files in pats |
1383 def badfn(f, msg): |
1383 def badfn(f, msg): |
1384 if f != b'.hgsubstate': # .hgsubstate is auto-created |
1384 if f != b'.hgsubstate': # .hgsubstate is auto-created |
1385 raise error.Abort(b'%s: %s' % (f, msg)) |
1385 raise error.Abort(b'%s: %s' % (f, msg)) |
1906 cparents = repo.changelog.parents(top) |
1906 cparents = repo.changelog.parents(top) |
1907 patchparent = self.qparents(repo, top) |
1907 patchparent = self.qparents(repo, top) |
1908 |
1908 |
1909 inclsubs = checksubstate(repo, patchparent) |
1909 inclsubs = checksubstate(repo, patchparent) |
1910 if inclsubs: |
1910 if inclsubs: |
1911 substatestate = repo.dirstate[b'.hgsubstate'] |
1911 substatestate = repo.dirstate.get_entry(b'.hgsubstate') |
1912 |
1912 |
1913 ph = patchheader(self.join(patchfn), self.plainmode) |
1913 ph = patchheader(self.join(patchfn), self.plainmode) |
1914 diffopts = self.diffopts( |
1914 diffopts = self.diffopts( |
1915 {b'git': opts.get(b'git')}, patchfn, plain=True |
1915 {b'git': opts.get(b'git')}, patchfn, plain=True |
1916 ) |
1916 ) |