| hg-reviewers |
This has a test impact. It seems to me to be for the better.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
In D5859#85954, @martinvonz wrote:This one breaks tests, so I'll need to fix that.
Done.
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/subrepo.py (12 lines) | |||
| M | tests/test-subrepo-git.t (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| ui.write(output) | ui.write(output) | ||||
| @annotatesubrepoerror | @annotatesubrepoerror | ||||
| def revert(self, substate, *pats, **opts): | def revert(self, substate, *pats, **opts): | ||||
| self.ui.status(_('reverting subrepo %s\n') % substate[0]) | self.ui.status(_('reverting subrepo %s\n') % substate[0]) | ||||
| if not opts.get(r'no_backup'): | if not opts.get(r'no_backup'): | ||||
| status = self.status(None) | status = self.status(None) | ||||
| names = status.modified | names = status.modified | ||||
| origvfs = scmutil.getorigvfs(self.ui, self._subparent) | |||||
| if origvfs is None: | |||||
| origvfs = self.wvfs | |||||
| for name in names: | for name in names: | ||||
| bakname = scmutil.origpath(self.ui, self._subparent, name) | # backuppath() expects a path relative to the parent repo (the | ||||
| # repo that ui.origbackuppath is relative to) | |||||
| parentname = os.path.join(self._path, name) | |||||
| bakname = scmutil.backuppath(self.ui, self._subparent, | |||||
| parentname) | |||||
| self.ui.note(_('saving current version of %s as %s\n') % | self.ui.note(_('saving current version of %s as %s\n') % | ||||
| (name, os.path.relpath(bakname))) | (name, os.path.relpath(bakname))) | ||||
| name = self.wvfs.join(name) | util.rename(self.wvfs.join(name), bakname) | ||||
| origvfs.rename(name, bakname) | |||||
| if not opts.get(r'dry_run'): | if not opts.get(r'dry_run'): | ||||
| self.get(substate, overwrite=True) | self.get(substate, overwrite=True) | ||||
| return [] | return [] | ||||
| def shortid(self, revid): | def shortid(self, revid): | ||||
| return revid[:7] | return revid[:7] | ||||
| types = { | types = { | ||||
| 'hg': hgsubrepo, | 'hg': hgsubrepo, | ||||
| 'svn': svnsubrepo, | 'svn': svnsubrepo, | ||||
| 'git': gitsubrepo, | 'git': gitsubrepo, | ||||
| } | } | ||||
| $ hg status --subrepos | $ hg status --subrepos | ||||
| ? s/barfoo | ? s/barfoo | ||||
| revert moves orig files to the right place | revert moves orig files to the right place | ||||
| $ echo 'bloop' > s/foobar | $ echo 'bloop' > s/foobar | ||||
| $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups' | $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups' | ||||
| reverting subrepo ../gitroot | reverting subrepo ../gitroot | ||||
| creating directory: $TESTTMP/tc/.hg/origbackups | creating directory: $TESTTMP/tc/.hg/origbackups/s | ||||
| saving current version of foobar as .hg/origbackups/foobar | saving current version of foobar as .hg/origbackups/s/foobar | ||||
| $ ls .hg/origbackups | $ ls .hg/origbackups/s | ||||
| foobar | foobar | ||||
| $ rm -rf .hg/origbackups | $ rm -rf .hg/origbackups | ||||
| show file at specific revision | show file at specific revision | ||||
| $ cat > s/foobar << EOF | $ cat > s/foobar << EOF | ||||
| > woop woop | > woop woop | ||||
| > fooo bar | > fooo bar | ||||
| > EOF | > EOF | ||||