Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 41593:59025c9b3540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: always show relative path to .orig backup Same as previous commit, but for subrepo. Differential Revision: https://phab.mercurial-scm.org/D5873
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 06 Feb 2019 15:35:25 -0800
parents 13a6dd952ffe
children ea5ebb8f72bd
comparison
equal deleted inserted replaced
41592:e67a85e0f19e 41593:59025c9b3540
1828 if origvfs is None: 1828 if origvfs is None:
1829 origvfs = self.wvfs 1829 origvfs = self.wvfs
1830 for name in names: 1830 for name in names:
1831 bakname = scmutil.origpath(self.ui, self._subparent, name) 1831 bakname = scmutil.origpath(self.ui, self._subparent, name)
1832 self.ui.note(_('saving current version of %s as %s\n') % 1832 self.ui.note(_('saving current version of %s as %s\n') %
1833 (name, bakname)) 1833 (name, os.path.relpath(bakname)))
1834 name = self.wvfs.join(name) 1834 name = self.wvfs.join(name)
1835 origvfs.rename(name, bakname) 1835 origvfs.rename(name, bakname)
1836 1836
1837 if not opts.get(r'dry_run'): 1837 if not opts.get(r'dry_run'):
1838 self.get(substate, overwrite=True) 1838 self.get(substate, overwrite=True)