Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/subrepo.py @ 32196:a77e61b45384
py3: handle opts correctly for `hg add`
opts in add command were passed again to cmdutil.add() as kwargs so we need
to convert them again to str. Intstead we convert them to bytes when passing
scmutil.match(). Opts handling is also corrected for all the functions which
are called from cmdutil.add().
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 25 Apr 2017 01:52:30 +0530 |
| parents | 2406dbba49bd |
| children | 09fb3d3b1b3a |
comparison
equal
deleted
inserted
replaced
| 32195:e807c373846a | 32196:a77e61b45384 |
|---|---|
| 1769 | 1769 |
| 1770 if f in tracked: # hg prints 'adding' even if already tracked | 1770 if f in tracked: # hg prints 'adding' even if already tracked |
| 1771 if exact: | 1771 if exact: |
| 1772 rejected.append(f) | 1772 rejected.append(f) |
| 1773 continue | 1773 continue |
| 1774 if not opts.get('dry_run'): | 1774 if not opts.get(r'dry_run'): |
| 1775 self._gitcommand(command + [f]) | 1775 self._gitcommand(command + [f]) |
| 1776 | 1776 |
| 1777 for f in rejected: | 1777 for f in rejected: |
| 1778 ui.warn(_("%s already tracked!\n") % match.abs(f)) | 1778 ui.warn(_("%s already tracked!\n") % match.abs(f)) |
| 1779 | 1779 |